From ed6dd803bc5b5749e13f5e2ef902e5f503407d7f Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Mon, 21 Jul 2008 20:03:34 -0700
Subject: [PATCH] --- yaml --- r: 115111 b: refs/heads/master c:
 1ff9f542e5f87c299226557ce5e67a402ed4b502 h: refs/heads/master i:   115109:
 587a5f35de9c1e6b6b1d0037b6fea8cccb25e365   115107:
 05271b648b9a55bc6065c3d81d05e9727e2496d4   115103:
 3c760f2a73a92283aba68327043181d40327486d v: v3

---
 [refs]                           |  2 +-
 trunk/block/bsg.c                |  3 +--
 trunk/drivers/block/aoe/aoechr.c |  6 +++---
 trunk/drivers/block/paride/pg.c  |  5 ++---
 trunk/drivers/block/paride/pt.c  | 10 ++++------
 trunk/drivers/block/pktcdvd.c    |  5 ++---
 6 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/[refs] b/[refs]
index 8e188b1b9310..8153e460b6d5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ae87221d3ce49d9de1e43756da834fd0bf05a2ad
+refs/heads/master: 1ff9f542e5f87c299226557ce5e67a402ed4b502
diff --git a/trunk/block/bsg.c b/trunk/block/bsg.c
index 56cb343c76d8..034112bfe1f3 100644
--- a/trunk/block/bsg.c
+++ b/trunk/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/trunk/drivers/block/aoe/aoechr.c b/trunk/drivers/block/aoe/aoechr.c
index 1f56d2c5b7fc..200efc4d2c1e 100644
--- a/trunk/drivers/block/aoe/aoechr.c
+++ b/trunk/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/trunk/drivers/block/paride/pg.c b/trunk/drivers/block/paride/pg.c
index d731ca42f802..9dfa27163001 100644
--- a/trunk/drivers/block/paride/pg.c
+++ b/trunk/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/trunk/drivers/block/paride/pt.c b/trunk/drivers/block/paride/pt.c
index 673b8b2fd337..5ae229656eaa 100644
--- a/trunk/drivers/block/paride/pt.c
+++ b/trunk/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/trunk/drivers/block/pktcdvd.c b/trunk/drivers/block/pktcdvd.c
index 0e077150568b..195ca7c720f5 100644
--- a/trunk/drivers/block/pktcdvd.c
+++ b/trunk/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;
 	}