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

mtd: Convert from class_device to device for MTD/mtdchar 



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: David Woodhouse <dwmw2@infradead.org>
Cc: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 0c55445f

drivers/mtd/mtdchar.c

+5 −7
Original line number Diff line number Diff line
@@ -27,12 +27,10 @@ static void mtd_notify_add(struct mtd_info* mtd) 
	if (!mtd)

		return;



	class_device_create(mtd_class, NULL, MKDEV(MTD_CHAR_MAJOR, mtd->index*2),

			    NULL, "mtd%d", mtd->index);

	device_create(mtd_class, NULL, MKDEV(MTD_CHAR_MAJOR, mtd->index*2), "mtd%d", mtd->index);



	class_device_create(mtd_class, NULL,

			    MKDEV(MTD_CHAR_MAJOR, mtd->index*2+1),

			    NULL, "mtd%dro", mtd->index);

	device_create(mtd_class, NULL,

		      MKDEV(MTD_CHAR_MAJOR, mtd->index*2+1), "mtd%dro", mtd->index);

}



static void mtd_notify_remove(struct mtd_info* mtd)
@@ -40,8 +38,8 @@ static void mtd_notify_remove(struct mtd_info* mtd) 
	if (!mtd)

		return;



	class_device_destroy(mtd_class, MKDEV(MTD_CHAR_MAJOR, mtd->index*2));

	class_device_destroy(mtd_class, MKDEV(MTD_CHAR_MAJOR, mtd->index*2+1));

	device_destroy(mtd_class, MKDEV(MTD_CHAR_MAJOR, mtd->index*2));

	device_destroy(mtd_class, MKDEV(MTD_CHAR_MAJOR, mtd->index*2+1));

}



static struct mtd_notifier notifier = {