[PATCH v2 16/24] blk: Drop IF_TYPE_SD
Simon Glass
sjg at chromium.org
Fri Aug 12 03:34:55 CEST 2022
This is not really needed since it does the same things as MMC. Drop it.
Signed-off-by: Simon Glass <sjg at chromium.org>
---
(no changes since v1)
disk/part.c | 2 --
drivers/block/blk-uclass.c | 2 --
include/blk.h | 1 -
3 files changed, 5 deletions(-)
diff --git a/disk/part.c b/disk/part.c
index a5c1d7a0aec..2bcc6f4f403 100644
--- a/disk/part.c
+++ b/disk/part.c
@@ -135,7 +135,6 @@ void dev_print (struct blk_desc *dev_desc)
dev_desc->revision,
dev_desc->product);
break;
- case IF_TYPE_SD:
case IF_TYPE_MMC:
case IF_TYPE_USB:
case IF_TYPE_NVME:
@@ -772,7 +771,6 @@ void part_set_generic_name(const struct blk_desc *dev_desc,
devtype = "usbd";
break;
case IF_TYPE_MMC:
- case IF_TYPE_SD:
devtype = "mmcsd";
break;
default:
diff --git a/drivers/block/blk-uclass.c b/drivers/block/blk-uclass.c
index 57230e9bab7..2fa6a7e6883 100644
--- a/drivers/block/blk-uclass.c
+++ b/drivers/block/blk-uclass.c
@@ -22,7 +22,6 @@ static const char *if_typename_str[IF_TYPE_COUNT] = {
[IF_TYPE_SCSI] = "scsi",
[IF_TYPE_USB] = "usb",
[IF_TYPE_MMC] = "mmc",
- [IF_TYPE_SD] = "sd",
[IF_TYPE_SATA] = "sata",
[IF_TYPE_HOST] = "host",
[IF_TYPE_NVME] = "nvme",
@@ -37,7 +36,6 @@ static enum uclass_id if_type_uclass_id[IF_TYPE_COUNT] = {
[IF_TYPE_SCSI] = UCLASS_SCSI,
[IF_TYPE_USB] = UCLASS_MASS_STORAGE,
[IF_TYPE_MMC] = UCLASS_MMC,
- [IF_TYPE_SD] = UCLASS_INVALID,
[IF_TYPE_SATA] = UCLASS_AHCI,
[IF_TYPE_HOST] = UCLASS_ROOT,
[IF_TYPE_NVME] = UCLASS_NVME,
diff --git a/include/blk.h b/include/blk.h
index c7461f9f35a..cc30e3861fa 100644
--- a/include/blk.h
+++ b/include/blk.h
@@ -33,7 +33,6 @@ enum if_type {
IF_TYPE_SCSI,
IF_TYPE_USB,
IF_TYPE_MMC,
- IF_TYPE_SD,
IF_TYPE_SATA,
IF_TYPE_HOST,
IF_TYPE_NVME,
--
2.37.1.595.g718a3a8f04-goog
More information about the U-Boot
mailing list