From: Tony Jones 
struct class_device is going away, this converts the code to use struct

device instead.
Signed-off-by: Tony Jones

Cc: Tim Waugh

Cc: Jens Axboe

Cc: Kay Sievers

Signed-off-by: Greg Kroah-Hartman

---

 drivers/block/paride/pg.c |    6 +++---

 drivers/block/paride/pt.c |   12 ++++++------

 2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/block/paride/pg.c b/drivers/block/paride/pg.c

index d89e7d3..ab86e23 100644

--- a/drivers/block/paride/pg.c

+++ b/drivers/block/paride/pg.c

@@ -676,8 +676,8 @@ static int __init pg_init(void)

 	for (unit = 0; unit < PG_UNITS; unit++) {

 		struct pg *dev = &devices[unit];

 		if (dev->present)

-			class_device_create(pg_class, NULL, MKDEV(major, unit),

-					NULL, "pg%u", unit);

+			device_create(pg_class, NULL, MKDEV(major, unit),

+				      "pg%u", unit);

 	}

 	err = 0;

 	goto out;

@@ -695,7 +695,7 @@ static void __exit pg_exit(void)

 	for (unit = 0; unit < PG_UNITS; unit++) {

 		struct pg *dev = &devices[unit];

 		if (dev->present)

-			class_device_destroy(pg_class, MKDEV(major, unit));

+			device_destroy(pg_class, MKDEV(major, unit));

 	}

 	class_destroy(pg_class);

 	unregister_chrdev(major, name);

diff --git a/drivers/block/paride/pt.c b/drivers/block/paride/pt.c

index b91accf..76096ca 100644

--- a/drivers/block/paride/pt.c

+++ b/drivers/block/paride/pt.c

@@ -972,10 +972,10 @@ static int __init pt_init(void)
 	for (unit = 0; unit < PT_UNITS; unit++)

 		if (pt[unit].present) {

-			class_device_create(pt_class, NULL, MKDEV(major, unit),

-					NULL, "pt%d", unit);

-			class_device_create(pt_class, NULL, MKDEV(major, unit + 128),

-					NULL, "pt%dn", unit);

+			device_create(pt_class, NULL, MKDEV(major, unit),

+				      "pt%d", unit);

+			device_create(pt_class, NULL, MKDEV(major, unit + 128),

+				      "pt%dn", unit);

 		}

 	goto out;
@@ -990,8 +990,8 @@ static void __exit pt_exit(void)

 	int unit;

 	for (unit = 0; unit < PT_UNITS; unit++)

 		if (pt[unit].present) {

-			class_device_destroy(pt_class, MKDEV(major, unit));

-			class_device_destroy(pt_class, MKDEV(major, unit + 128));

+			device_destroy(pt_class, MKDEV(major, unit));

+			device_destroy(pt_class, MKDEV(major, unit + 128));

 		}

 	class_destroy(pt_class);

 	unregister_chrdev(major, name);

--

1.5.3.8
--

unsubscribe notice
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in

the body of a message to majordomo@vger.kernel.org

More majordomo info at  http://vger.kernel.org/majordomo-info.html

Please read the FAQ at  http://www.tux.org/lkml/