5 files changed, 17 insertions, 10 deletions

diff --git a/block/bsg.c b/block/bsg.c
index 5fb9b0bdbe85..5a68b09a69ba 100644
--- a/block/bsg.c
+++ b/block/bsg.c
@@ -1044,7 +1044,8 @@ 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(bsg_class, parent, dev, "%s", devname);
+        class_dev = device_create_drvdata(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 d1de68a31920..c04440cd6a32 100644
--- a/drivers/block/aoe/aoechr.c
+++ b/drivers/block/aoe/aoechr.c
@@ -277,8 +277,9 @@ aoechr_init(void)
                 return PTR_ERR(aoe_class);
         }
         for (i = 0; i < ARRAY_SIZE(chardevs); ++i)
-                device_create(aoe_class, NULL,
-                              MKDEV(AOE_MAJOR, chardevs[i].minor), chardevs[i].name);
+                device_create_drvdata(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 9d92636350e5..d731ca42f802 100644
--- a/drivers/block/paride/pg.c
+++ b/drivers/block/paride/pg.c
@@ -686,8 +686,9 @@ static int __init pg_init(void)
         for (unit = 0; unit < PG_UNITS; unit++) {
                 struct pg *dev = &devices[unit];
                 if (dev->present)
-                        device_create(pg_class, NULL, MKDEV(major, unit),
-                                      "pg%u", unit);
+                        device_create_drvdata(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 5c74c3574a5a..673b8b2fd337 100644
--- a/drivers/block/paride/pt.c
+++ b/drivers/block/paride/pt.c
@@ -979,10 +979,12 @@ static int __init pt_init(void)
 
         for (unit = 0; unit < PT_UNITS; unit++)
                 if (pt[unit].present) {
-                        device_create(pt_class, NULL, MKDEV(major, unit),
-                                      "pt%d", unit);
-                        device_create(pt_class, NULL, MKDEV(major, unit + 128),
-                                      "pt%dn", unit);
+                        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);
                 }
         goto out;
 
diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c
index 45bee918c46a..158eed4d5161 100644
--- a/drivers/block/pktcdvd.c
+++ b/drivers/block/pktcdvd.c
@@ -303,7 +303,9 @@ 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(class_pktcdvd, NULL, pd->pkt_dev, "%s", pd->name);
+                pd->dev = device_create_drvdata(class_pktcdvd, NULL,
+                                                pd->pkt_dev, NULL,
+                                                "%s", pd->name);
                 if (IS_ERR(pd->dev))
                         pd->dev = NULL;
         }