From db7e81154ec0bbd62dbb44ac225d22729988078e Mon Sep 17 00:00:00 2001 From: Heinrich Schuchardt Date: Fri, 18 Oct 2024 03:30:15 +0200 Subject: [PATCH] block: make blk_create_device() static There are no users of the blk_create_device() function outside the uclass. Let's make it static. This will ensure that new block drivers will use blk_create_devicef(). Signed-off-by: Heinrich Schuchardt Reviewed-by: Ilias Apalodimas Reviewed-by: Simon Glass --- drivers/block/blk-uclass.c | 19 ++++++++++++++++--- include/blk.h | 17 ----------------- 2 files changed, 16 insertions(+), 20 deletions(-) diff --git a/drivers/block/blk-uclass.c b/drivers/block/blk-uclass.c index 312e038445..f3ac8db946 100644 --- a/drivers/block/blk-uclass.c +++ b/drivers/block/blk-uclass.c @@ -695,9 +695,22 @@ static int blk_claim_devnum(enum uclass_id uclass_id, int devnum) return -ENOENT; } -int blk_create_device(struct udevice *parent, const char *drv_name, - const char *name, int uclass_id, int devnum, int blksz, - lbaint_t lba, struct udevice **devp) +/** + * blk_create_device() - Create a new block device + * + * @parent: Parent of the new device + * @drv_name: Driver name to use for the block device + * @name: Name for the device + * @uclass_id: Interface type (enum uclass_id_t) + * @devnum: Device number, specific to the interface type, or -1 to + * allocate the next available number + * @blksz: Block size of the device in bytes (typically 512) + * @lba: Total number of blocks of the device + * @devp: the new device (which has not been probed) + */ +static int blk_create_device(struct udevice *parent, const char *drv_name, + const char *name, int uclass_id, int devnum, + int blksz, lbaint_t lba, struct udevice **devp) { struct blk_desc *desc; struct udevice *dev; diff --git a/include/blk.h b/include/blk.h index eef6c8629e..488d04cf32 100644 --- a/include/blk.h +++ b/include/blk.h @@ -379,23 +379,6 @@ int blk_first_device(int uclass_id, struct udevice **devp); */ int blk_next_device(struct udevice **devp); -/** - * blk_create_device() - Create a new block device - * - * @parent: Parent of the new device - * @drv_name: Driver name to use for the block device - * @name: Name for the device - * @uclass_id: Interface type (enum uclass_id_t) - * @devnum: Device number, specific to the interface type, or -1 to - * allocate the next available number - * @blksz: Block size of the device in bytes (typically 512) - * @lba: Total number of blocks of the device - * @devp: the new device (which has not been probed) - */ -int blk_create_device(struct udevice *parent, const char *drv_name, - const char *name, int uclass_id, int devnum, int blksz, - lbaint_t lba, struct udevice **devp); - /** * blk_create_devicef() - Create a new named block device * -- 2.39.5