adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-29 12:16:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

device create: block: convert device_create_drvdata to device_create

Browse source 
Now that device_create() has been audited, rename things back to the
original call to be sane.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Greg Kroah-Hartman 2008-07-21 20:03:34 -07:00
parent ae87221d3c
commit 1ff9f542e5
5 changed files with 12 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
block/bsg.c
View file

@ -1024,8 +1024,7 @@ int bsg_register_queue(struct request_queue *q, struct device *parent,
bcd->release = release; bcd->release = release;
kref_init(&bcd->ref); kref_init(&bcd->ref);
dev = MKDEV(bsg_major, bcd->minor); dev = MKDEV(bsg_major, bcd->minor);
class_dev = device_create_drvdata(bsg_class, parent, dev, NULL, class_dev = device_create(bsg_class, parent, dev, NULL, "%s", devname);
"%s", devname);
if (IS_ERR(class_dev)) { if (IS_ERR(class_dev)) {
ret = PTR_ERR(class_dev); ret = PTR_ERR(class_dev);
goto put_dev; goto put_dev;

6
drivers/block/aoe/aoechr.c
View file

@ -284,9 +284,9 @@ aoechr_init(void)
return PTR_ERR(aoe_class); return PTR_ERR(aoe_class);
} }
for (i = 0; i < ARRAY_SIZE(chardevs); ++i) for (i = 0; i < ARRAY_SIZE(chardevs); ++i)
device_create_drvdata(aoe_class, NULL, device_create(aoe_class, NULL,
MKDEV(AOE_MAJOR, chardevs[i].minor), MKDEV(AOE_MAJOR, chardevs[i].minor), NULL,
NULL, chardevs[i].name); chardevs[i].name);
return 0; return 0;
} }

3
drivers/block/paride/pg.c
View file

@ -686,8 +686,7 @@ static int __init pg_init(void)
for (unit = 0; unit < PG_UNITS; unit++) { for (unit = 0; unit < PG_UNITS; unit++) {
struct pg *dev = &devices[unit]; struct pg *dev = &devices[unit];
if (dev->present) if (dev->present)
device_create_drvdata(pg_class, NULL, device_create(pg_class, NULL, MKDEV(major, unit), NULL,
MKDEV(major, unit), NULL,
"pg%u", unit); "pg%u", unit);
} }
err = 0; err = 0;

8
drivers/block/paride/pt.c
View file

@ -979,12 +979,10 @@ static int __init pt_init(void)
for (unit = 0; unit < PT_UNITS; unit++) for (unit = 0; unit < PT_UNITS; unit++)
if (pt[unit].present) { if (pt[unit].present) {
device_create_drvdata(pt_class, NULL, device_create(pt_class, NULL, MKDEV(major, unit), NULL,
MKDEV(major, unit), NULL,
"pt%d", unit); "pt%d", unit);
device_create_drvdata(pt_class, NULL, device_create(pt_class, NULL, MKDEV(major, unit + 128),
MKDEV(major, unit + 128), NULL, NULL, "pt%dn", unit);
"pt%dn", unit);
} }
goto out; goto out;

3
drivers/block/pktcdvd.c
View file

@ -302,8 +302,7 @@ static struct kobj_type kobj_pkt_type_wqueue = {
static void pkt_sysfs_dev_new(struct pktcdvd_device *pd) static void pkt_sysfs_dev_new(struct pktcdvd_device *pd)
{ {
if (class_pktcdvd) { if (class_pktcdvd) {
pd->dev = device_create_drvdata(class_pktcdvd, NULL, pd->dev = device_create(class_pktcdvd, NULL, pd->pkt_dev, NULL,
pd->pkt_dev, NULL,
"%s", pd->name); "%s", pd->name);
if (IS_ERR(pd->dev)) if (IS_ERR(pd->dev))
pd->dev = NULL; pd->dev = NULL;