[PATCH] USB: storage: register disks as usbdiskx

Sascha Hauer s.hauer at pengutronix.de
Fri Oct 18 06:07:31 EDT 2013


To better identify them as USB storage devices. Also make the
info message look nicer.

Signed-off-by: Sascha Hauer <s.hauer at pengutronix.de>
---
 drivers/usb/storage/usb.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/usb/storage/usb.c b/drivers/usb/storage/usb.c
index e4b08b9..fbf458f 100644
--- a/drivers/usb/storage/usb.c
+++ b/drivers/usb/storage/usb.c
@@ -392,12 +392,11 @@ static int usb_stor_add_blkdev(struct us_data *us, struct device_d *dev,
 	if (result < 0)
 		goto BadDevice;
 
-	result = cdev_find_free_index("disk");
+	result = cdev_find_free_index("usbdisk");
 	if (result == -1)
 		pr_err("Cannot find a free number for the disk node\n");
-	pr_info("Using index %d for the new disk\n", result);
 
-	pblk_dev->blk.cdev.name = asprintf("disk%d", result);
+	pblk_dev->blk.cdev.name = asprintf("usbdisk%d", result);
 	pblk_dev->blk.blockbits = SECTOR_SHIFT;
 
 	result = blockdevice_register(&pblk_dev->blk);
@@ -406,6 +405,8 @@ static int usb_stor_add_blkdev(struct us_data *us, struct device_d *dev,
 		goto BadDevice;
 	}
 
+	dev_info(dev, "registered /dev/%s\n", pblk_dev->blk.cdev.name);
+
 	/* create partitions on demand */
 	result = parse_partition_table(&pblk_dev->blk);
 	if (result != 0)
-- 
1.8.4.rc3




More information about the barebox mailing list