[PATCH] usb: storage: make disk cdev name configurable via Kconfig

From: Anis Chali <[email protected]>

Add USBDISK_NAME string option to allow customizing the USB storage
device name, defaulting to "disk" to preserve existing behaviour.

Signed-off-by: Anis Chali <[email protected]>
---
 drivers/usb/storage/Kconfig | 5 +++++
 drivers/usb/storage/usb.c   | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/drivers/usb/storage/Kconfig b/drivers/usb/storage/Kconfig
index efca9874d5..90a62a9d24 100644
--- a/drivers/usb/storage/Kconfig
+++ b/drivers/usb/storage/Kconfig
@@ -2,3 +2,8 @@
 config USB_STORAGE
 	tristate "USB Mass Storage support"
 	select DISK
+
+config USBDISK_NAME
+	string "USB storage disk name"
+	depends on USB_STORAGE
+	default "disk"
diff --git a/drivers/usb/storage/usb.c b/drivers/usb/storage/usb.c
index b3116dc6e6..b6944f531d 100644
--- a/drivers/usb/storage/usb.c
+++ b/drivers/usb/storage/usb.c
@@ -414,12 +414,12 @@ static int usb_stor_add_blkdev(struct us_data *us, unsigned char lun)
 	if (result < 0)
 		goto BadDevice;
 
-	result = cdev_find_free_index("disk");
+	result = cdev_find_free_index(CONFIG_USBDISK_NAME);
 	if (result == -1)
 		pr_err("Cannot find a free number for the disk node\n");
-	dev_info(dev, "registering as disk%d\n", result);
+	dev_info(dev, "registering as %s%d\n", CONFIG_USBDISK_NAME, result);
 
-	pblk_dev->blk.cdev.name = basprintf("disk%d", result);
+	pblk_dev->blk.cdev.name = basprintf("%s%d", CONFIG_USBDISK_NAME, result);
 	pblk_dev->blk.blockbits = SECTOR_SHIFT;
 	pblk_dev->blk.type = BLK_TYPE_USB;
 	pblk_dev->blk.removable = true;
-- 
2.54.0