This is not really needed since it does the same things as IDE. Drop it.
Signed-off-by: Simon Glass sjg@chromium.org ---
(no changes since v1)
disk/part.c | 5 ----- drivers/block/blk-uclass.c | 2 -- include/blk.h | 1 - 3 files changed, 8 deletions(-)
diff --git a/disk/part.c b/disk/part.c index 5f64da54e54..a5c1d7a0aec 100644 --- a/disk/part.c +++ b/disk/part.c @@ -128,7 +128,6 @@ void dev_print (struct blk_desc *dev_desc) dev_desc->product, dev_desc->revision); break; - case IF_TYPE_ATAPI: case IF_TYPE_IDE: case IF_TYPE_SATA: printf ("Model: %s Firm: %s Ser#: %s\n", @@ -257,9 +256,6 @@ static void print_part_header(const char *type, struct blk_desc *dev_desc) case IF_TYPE_SCSI: puts ("SCSI"); break; - case IF_TYPE_ATAPI: - puts ("ATAPI"); - break; case IF_TYPE_USB: puts ("USB"); break; @@ -767,7 +763,6 @@ void part_set_generic_name(const struct blk_desc *dev_desc, switch (dev_desc->if_type) { case IF_TYPE_IDE: case IF_TYPE_SATA: - case IF_TYPE_ATAPI: devtype = "hd"; break; case IF_TYPE_SCSI: diff --git a/drivers/block/blk-uclass.c b/drivers/block/blk-uclass.c index f16cb279d4e..57230e9bab7 100644 --- a/drivers/block/blk-uclass.c +++ b/drivers/block/blk-uclass.c @@ -20,7 +20,6 @@ static const char *if_typename_str[IF_TYPE_COUNT] = { [IF_TYPE_IDE] = "ide", [IF_TYPE_SCSI] = "scsi", - [IF_TYPE_ATAPI] = "atapi", [IF_TYPE_USB] = "usb", [IF_TYPE_MMC] = "mmc", [IF_TYPE_SD] = "sd", @@ -36,7 +35,6 @@ static const char *if_typename_str[IF_TYPE_COUNT] = { static enum uclass_id if_type_uclass_id[IF_TYPE_COUNT] = { [IF_TYPE_IDE] = UCLASS_IDE, [IF_TYPE_SCSI] = UCLASS_SCSI, - [IF_TYPE_ATAPI] = UCLASS_INVALID, [IF_TYPE_USB] = UCLASS_MASS_STORAGE, [IF_TYPE_MMC] = UCLASS_MMC, [IF_TYPE_SD] = UCLASS_INVALID, diff --git a/include/blk.h b/include/blk.h index 1898ebdda54..c7461f9f35a 100644 --- a/include/blk.h +++ b/include/blk.h @@ -31,7 +31,6 @@ enum if_type { IF_TYPE_UNKNOWN = 0, IF_TYPE_IDE, IF_TYPE_SCSI, - IF_TYPE_ATAPI, IF_TYPE_USB, IF_TYPE_MMC, IF_TYPE_SD,