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

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

drivers/block/paride/pg.c

+3 −3
Original line number Diff line number Diff line
@@ -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);

drivers/block/paride/pt.c

+6 −6
Original line number Diff line number Diff line
@@ -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);

CRA Git | Maintained and supported by SUSTech CRA and CCSE