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: Tony 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: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
a98894ab02
commit
aa27582614
2 changed files with 9 additions and 9 deletions
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Reference in a new issue