blk: Drop IF_TYPE_ATAPI
This is not really needed since it does the same things as IDE. Drop it.
Signed-off-by: Simon Glass <sjg@chromium.org>
diff --git a/disk/part.c b/disk/part.c
index 5f64da5..a5c1d7a 100644
--- a/disk/part.c
+++ b/disk/part.c
@@ -128,7 +128,6 @@
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 @@
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 @@
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 f16cb27..57230e9 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 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 1898ebd..c7461f9 100644
--- a/include/blk.h
+++ b/include/blk.h
@@ -31,7 +31,6 @@
IF_TYPE_UNKNOWN = 0,
IF_TYPE_IDE,
IF_TYPE_SCSI,
- IF_TYPE_ATAPI,
IF_TYPE_USB,
IF_TYPE_MMC,
IF_TYPE_SD,