Skip to content

Commit

Permalink
paride: Convert from class_device to device for block/paride
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Tony Jones authored and Greg Kroah-Hartman committed Jan 25, 2008
1 parent a98894a commit aa27582
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
6 changes: 3 additions & 3 deletions drivers/block/paride/pg.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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);
Expand Down
12 changes: 6 additions & 6 deletions drivers/block/paride/pt.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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);
Expand Down

0 comments on commit aa27582

Please sign in to comment.