diff options
| -rw-r--r-- | block/bsg.c | 3 | ||||
| -rw-r--r-- | drivers/block/aoe/aoechr.c | 6 | ||||
| -rw-r--r-- | drivers/block/paride/pg.c | 5 | ||||
| -rw-r--r-- | drivers/block/paride/pt.c | 10 | ||||
| -rw-r--r-- | drivers/block/pktcdvd.c | 5 |
5 files changed, 12 insertions, 17 deletions
diff --git a/block/bsg.c b/block/bsg.c index 56cb343c76d8..034112bfe1f3 100644 --- a/block/bsg.c +++ b/block/bsg.c @@ -1024,8 +1024,7 @@ int bsg_register_queue(struct request_queue *q, struct device *parent, bcd->release = release; kref_init(&bcd->ref); dev = MKDEV(bsg_major, bcd->minor); - class_dev = device_create_drvdata(bsg_class, parent, dev, NULL, - "%s", devname); + class_dev = device_create(bsg_class, parent, dev, NULL, "%s", devname); if (IS_ERR(class_dev)) { ret = PTR_ERR(class_dev); goto put_dev; diff --git a/drivers/block/aoe/aoechr.c b/drivers/block/aoe/aoechr.c index 1f56d2c5b7fc..200efc4d2c1e 100644 --- a/drivers/block/aoe/aoechr.c +++ b/drivers/block/aoe/aoechr.c @@ -284,9 +284,9 @@ aoechr_init(void) return PTR_ERR(aoe_class); } for (i = 0; i < ARRAY_SIZE(chardevs); ++i) - device_create_drvdata(aoe_class, NULL, - MKDEV(AOE_MAJOR, chardevs[i].minor), - NULL, chardevs[i].name); + device_create(aoe_class, NULL, + MKDEV(AOE_MAJOR, chardevs[i].minor), NULL, + chardevs[i].name); return 0; } diff --git a/drivers/block/paride/pg.c b/drivers/block/paride/pg.c index d731ca42f802..9dfa27163001 100644 --- a/drivers/block/paride/pg.c +++ b/drivers/block/paride/pg.c @@ -686,9 +686,8 @@ static int __init pg_init(void) for (unit = 0; unit < PG_UNITS; unit++) { struct pg *dev = &devices[unit]; if (dev->present) - device_create_drvdata(pg_class, NULL, - MKDEV(major, unit), NULL, - "pg%u", unit); + device_create(pg_class, NULL, MKDEV(major, unit), NULL, + "pg%u", unit); } err = 0; goto out; diff --git a/drivers/block/paride/pt.c b/drivers/block/paride/pt.c index 673b8b2fd337..5ae229656eaa 100644 --- a/drivers/block/paride/pt.c +++ b/drivers/block/paride/pt.c @@ -979,12 +979,10 @@ static int __init pt_init(void) for (unit = 0; unit < PT_UNITS; unit++) if (pt[unit].present) { - device_create_drvdata(pt_class, NULL, - MKDEV(major, unit), NULL, - "pt%d", unit); - device_create_drvdata(pt_class, NULL, - MKDEV(major, unit + 128), NULL, - "pt%dn", unit); + device_create(pt_class, NULL, MKDEV(major, unit), NULL, + "pt%d", unit); + device_create(pt_class, NULL, MKDEV(major, unit + 128), + NULL, "pt%dn", unit); } goto out; diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c index 0e077150568b..195ca7c720f5 100644 --- a/drivers/block/pktcdvd.c +++ b/drivers/block/pktcdvd.c @@ -302,9 +302,8 @@ static struct kobj_type kobj_pkt_type_wqueue = { static void pkt_sysfs_dev_new(struct pktcdvd_device *pd) { if (class_pktcdvd) { - pd->dev = device_create_drvdata(class_pktcdvd, NULL, - pd->pkt_dev, NULL, - "%s", pd->name); + pd->dev = device_create(class_pktcdvd, NULL, pd->pkt_dev, NULL, + "%s", pd->name); if (IS_ERR(pd->dev)) pd->dev = NULL; } |
