blk: Drop if_type

Use the uclass ID instead.

Signed-off-by: Simon Glass <sjg@chromium.org>
Acked-by: Heinrich Schuchardt <xypron.glpk@gmx.de>

1 files changed, 10 insertions, 10 deletions

diff --git a/drivers/block/blk_legacy.c b/drivers/block/blk_legacy.c
index bd8a17df6a9..8c6f9cb208e 100644
--- a/drivers/block/blk_legacy.c
+++ b/drivers/block/blk_legacy.c
@@ -39,7 +39,7 @@ static struct blk_driver *blk_driver_lookup_typename(const char *if_typename)
 	return NULL;
 }
 
-const char *blk_get_if_type_name(enum if_type if_type)
+const char *blk_get_if_type_name(enum uclass_id if_type)
 {
 	struct blk_driver *drv = blk_driver_lookup_type(if_type);
 
@@ -70,7 +70,7 @@ static int get_desc(struct blk_driver *drv, int devnum, struct blk_desc **descp)
 	return drv->get_dev(devnum, descp);
 }
 
-int blk_list_part(enum if_type if_type)
+int blk_list_part(enum uclass_id if_type)
 {
 	struct blk_driver *drv;
 	struct blk_desc *desc;
@@ -97,7 +97,7 @@ int blk_list_part(enum if_type if_type)
 	return 0;
 }
 
-int blk_print_part_devnum(enum if_type if_type, int devnum)
+int blk_print_part_devnum(enum uclass_id if_type, int devnum)
 {
 	struct blk_driver *drv = blk_driver_lookup_type(if_type);
 	struct blk_desc *desc;
@@ -115,7 +115,7 @@ int blk_print_part_devnum(enum if_type if_type, int devnum)
 	return 0;
 }
 
-void blk_list_devices(enum if_type if_type)
+void blk_list_devices(enum uclass_id if_type)
 {
 	struct blk_driver *drv = blk_driver_lookup_type(if_type);
 	struct blk_desc *desc;
@@ -133,7 +133,7 @@ void blk_list_devices(enum if_type if_type)
 	}
 }
 
-int blk_print_device_num(enum if_type if_type, int devnum)
+int blk_print_device_num(enum uclass_id if_type, int devnum)
 {
 	struct blk_driver *drv = blk_driver_lookup_type(if_type);
 	struct blk_desc *desc;
@@ -150,7 +150,7 @@ int blk_print_device_num(enum if_type if_type, int devnum)
 	return 0;
 }
 
-int blk_show_device(enum if_type if_type, int devnum)
+int blk_show_device(enum uclass_id if_type, int devnum)
 {
 	struct blk_driver *drv = blk_driver_lookup_type(if_type);
 	struct blk_desc *desc;
@@ -174,7 +174,7 @@ int blk_show_device(enum if_type if_type, int devnum)
 	return 0;
 }
 
-struct blk_desc *blk_get_devnum_by_type(enum if_type if_type, int devnum)
+struct blk_desc *blk_get_devnum_by_type(enum uclass_id if_type, int devnum)
 {
 	struct blk_driver *drv = blk_driver_lookup_type(if_type);
 	struct blk_desc *desc;
@@ -214,7 +214,7 @@ struct blk_desc *blk_get_devnum_by_typename(const char *if_typename, int devnum)
 	return desc;
 }
 
-ulong blk_read_devnum(enum if_type if_type, int devnum, lbaint_t start,
+ulong blk_read_devnum(enum uclass_id if_type, int devnum, lbaint_t start,
 		      lbaint_t blkcnt, void *buffer)
 {
 	struct blk_driver *drv = blk_driver_lookup_type(if_type);
@@ -234,7 +234,7 @@ ulong blk_read_devnum(enum if_type if_type, int devnum, lbaint_t start,
 	return n;
 }
 
-ulong blk_write_devnum(enum if_type if_type, int devnum, lbaint_t start,
+ulong blk_write_devnum(enum uclass_id if_type, int devnum, lbaint_t start,
 		       lbaint_t blkcnt, const void *buffer)
 {
 	struct blk_driver *drv = blk_driver_lookup_type(if_type);
@@ -249,7 +249,7 @@ ulong blk_write_devnum(enum if_type if_type, int devnum, lbaint_t start,
 	return desc->block_write(desc, start, blkcnt, buffer);
 }
 
-int blk_select_hwpart_devnum(enum if_type if_type, int devnum, int hwpart)
+int blk_select_hwpart_devnum(enum uclass_id if_type, int devnum, int hwpart)
 {
 	struct blk_driver *drv = blk_driver_lookup_type(if_type);
 	struct blk_desc *desc;