summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2009-06-11 15:33:49 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2009-07-21 16:41:47 +0200
commit02ba8a0542f119e02e63a3b4cd6ae5abfd8331f3 (patch)
treec358a8c1f4d1cc5db91d898e6f409f55b22f4127 /drivers
parent2f8df2a003a22e8b7397e51ac5f1796db920d579 (diff)
downloadbarebox-02ba8a0542f119e02e63a3b4cd6ae5abfd8331f3.tar.gz
barebox-02ba8a0542f119e02e63a3b4cd6ae5abfd8331f3.tar.xz
get rid of device ids
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/nand/nand.c29
-rw-r--r--drivers/nor/cfi_flash.c4
-rw-r--r--drivers/nor/cfi_flash_new.c4
-rw-r--r--drivers/usb/usb.c1
4 files changed, 6 insertions, 32 deletions
diff --git a/drivers/nand/nand.c b/drivers/nand/nand.c
index f90a7ecece..2b3dec0f91 100644
--- a/drivers/nand/nand.c
+++ b/drivers/nand/nand.c
@@ -152,37 +152,16 @@ static struct file_operations nand_ops = {
.erase = nand_erase,
};
-static int nand_device_probe(struct device_d *dev)
-{
- return 0;
-}
-
-static struct driver_d nand_device_driver = {
- .name = "nand_device",
- .probe = nand_device_probe,
-};
-
-static int nand_init(void)
-{
- register_driver(&nand_device_driver);
-
- return 0;
-}
-
-device_initcall(nand_init);
-
int add_mtd_device(struct mtd_info *mtd)
{
- struct device_d *dev = &mtd->class_dev;
- char name[MAX_DRIVER_NAME];
-
- get_free_deviceid(name, "nand");
+ strcpy(mtd->class_dev.name, "nand");
+ register_device(&mtd->class_dev);
mtd->cdev.ops = &nand_ops;
mtd->cdev.size = mtd->size;
- mtd->cdev.name = strdup(name);
- mtd->cdev.dev = dev;
+ mtd->cdev.name = asprintf("nand%d", mtd->class_dev.id);
mtd->cdev.priv = mtd;
+ mtd->cdev.dev = &mtd->class_dev;
devfs_create(&mtd->cdev);
diff --git a/drivers/nor/cfi_flash.c b/drivers/nor/cfi_flash.c
index b38d291415..7131aa5707 100644
--- a/drivers/nor/cfi_flash.c
+++ b/drivers/nor/cfi_flash.c
@@ -1451,7 +1451,6 @@ static int cfi_probe (struct device_d *dev)
{
unsigned long size = 0;
flash_info_t *info = xzalloc(sizeof(flash_info_t));
- char name[MAX_DRIVER_NAME];
dev->priv = (void *)info;
@@ -1466,8 +1465,7 @@ static int cfi_probe (struct device_d *dev)
return -ENODEV;
}
- get_free_deviceid(name, "nor");
- info->cdev.name = strdup(name);
+ info->cdev.name = asprintf("nor%d", dev->id);
info->cdev.size = info->size;
info->cdev.dev = dev;
info->cdev.ops = &cfi_ops;
diff --git a/drivers/nor/cfi_flash_new.c b/drivers/nor/cfi_flash_new.c
index f45b97b839..e114bd2be6 100644
--- a/drivers/nor/cfi_flash_new.c
+++ b/drivers/nor/cfi_flash_new.c
@@ -948,7 +948,6 @@ static int cfi_probe (struct device_d *dev)
{
unsigned long size = 0;
flash_info_t *info = xzalloc(sizeof(flash_info_t));
- char name[MAX_DRIVER_NAME];
dev->priv = (void *)info;
@@ -969,8 +968,7 @@ static int cfi_probe (struct device_d *dev)
return -ENODEV;
}
- get_free_deviceid(name, "nor");
- info->cdev.name = strdup(name);
+ info->cdev.name = asprintf("nor%d", dev->id);
info->cdev.size = info->size;
info->cdev.dev = dev;
info->cdev.ops = &cfi_ops;
diff --git a/drivers/usb/usb.c b/drivers/usb/usb.c
index 61fddfa5d8..265e3f5191 100644
--- a/drivers/usb/usb.c
+++ b/drivers/usb/usb.c
@@ -424,7 +424,6 @@ static int usb_new_device(struct usb_device *dev)
usb_hub_probe(dev, 0);
sprintf(dev->dev.name, "usb%d-%d", dev->host->busnum, dev->devnum);
- sprintf(dev->dev.id, "usb%d-%d", dev->host->busnum, dev->devnum);
print_usb_device(dev);