Commit aa275826 authored by Tony Jones's avatar Tony Jones Committed by Greg Kroah-Hartman

paride: Convert from class_device to device for block/paride

struct class_device is going away, this converts the code to use struct
device instead.
Signed-off-by: default avatarTony Jones <tonyj@suse.de>
Cc: Tim Waugh <tim@cyberelk.net>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent a98894ab
...@@ -676,8 +676,8 @@ static int __init pg_init(void) ...@@ -676,8 +676,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)
class_device_create(pg_class, NULL, MKDEV(major, unit), device_create(pg_class, NULL, MKDEV(major, unit),
NULL, "pg%u", unit); "pg%u", unit);
} }
err = 0; err = 0;
goto out; goto out;
...@@ -695,7 +695,7 @@ static void __exit pg_exit(void) ...@@ -695,7 +695,7 @@ static void __exit pg_exit(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)
class_device_destroy(pg_class, MKDEV(major, unit)); device_destroy(pg_class, MKDEV(major, unit));
} }
class_destroy(pg_class); class_destroy(pg_class);
unregister_chrdev(major, name); unregister_chrdev(major, name);
......
...@@ -972,10 +972,10 @@ static int __init pt_init(void) ...@@ -972,10 +972,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) {
class_device_create(pt_class, NULL, MKDEV(major, unit), device_create(pt_class, NULL, MKDEV(major, unit),
NULL, "pt%d", unit); "pt%d", unit);
class_device_create(pt_class, NULL, MKDEV(major, unit + 128), device_create(pt_class, NULL, MKDEV(major, unit + 128),
NULL, "pt%dn", unit); "pt%dn", unit);
} }
goto out; goto out;
...@@ -990,8 +990,8 @@ static void __exit pt_exit(void) ...@@ -990,8 +990,8 @@ static void __exit pt_exit(void)
int unit; int unit;
for (unit = 0; unit < PT_UNITS; unit++) for (unit = 0; unit < PT_UNITS; unit++)
if (pt[unit].present) { if (pt[unit].present) {
class_device_destroy(pt_class, MKDEV(major, unit)); device_destroy(pt_class, MKDEV(major, unit));
class_device_destroy(pt_class, MKDEV(major, unit + 128)); device_destroy(pt_class, MKDEV(major, unit + 128));
} }
class_destroy(pt_class); class_destroy(pt_class);
unregister_chrdev(major, name); unregister_chrdev(major, name);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment