Forráskód Böngészése

device create: block: convert device_create_drvdata to device_create

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>
Greg Kroah-Hartman 17 éve
szülő
commit
1ff9f542e5

+ 1 - 2
block/bsg.c

@@ -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,
-					  "%s", devname);
+	class_dev = device_create(bsg_class, parent, dev, NULL, "%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;

+ 3 - 3
drivers/block/aoe/aoechr.c

@@ -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,
-				      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;
 	return 0;
 }
 }

+ 2 - 3
drivers/block/paride/pg.c

@@ -686,9 +686,8 @@ 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,
-					      MKDEV(major, unit), NULL,
-					      "pg%u", unit);
+			device_create(pg_class, NULL, MKDEV(major, unit), NULL,
+				      "pg%u", unit);
 	}
 	}
 	err = 0;
 	err = 0;
 	goto out;
 	goto out;

+ 4 - 6
drivers/block/paride/pt.c

@@ -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,
-					      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;
 	goto out;
 
 

+ 2 - 3
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)
 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->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))
 		if (IS_ERR(pd->dev))
 			pd->dev = NULL;
 			pd->dev = NULL;
 	}
 	}