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

pktcdvd: Convert from class_device to device for block/pktcdvd 



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: Peter Osterlund <petero2@telia.com>
Cc: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent aa275826

drivers/block/pktcdvd.c

+7 −9
Original line number Diff line number Diff line
@@ -301,18 +301,16 @@ static struct kobj_type kobj_pkt_type_wqueue = { 
static void pkt_sysfs_dev_new(struct pktcdvd_device *pd)

{

	if (class_pktcdvd) {

		pd->clsdev = class_device_create(class_pktcdvd,

					NULL, pd->pkt_dev,

					NULL, "%s", pd->name);

		if (IS_ERR(pd->clsdev))

			pd->clsdev = NULL;

		pd->dev = device_create(class_pktcdvd, NULL, pd->pkt_dev, "%s", pd->name);

		if (IS_ERR(pd->dev))

			pd->dev = NULL;

	}

	if (pd->clsdev) {

	if (pd->dev) {

		pd->kobj_stat = pkt_kobj_create(pd, "stat",

					&pd->clsdev->kobj,

					&pd->dev->kobj,

					&kobj_pkt_type_stat);

		pd->kobj_wqueue = pkt_kobj_create(pd, "write_queue",

					&pd->clsdev->kobj,

					&pd->dev->kobj,

					&kobj_pkt_type_wqueue);

	}

}
@@ -322,7 +320,7 @@ static void pkt_sysfs_dev_remove(struct pktcdvd_device *pd) 
	pkt_kobj_remove(pd->kobj_stat);

	pkt_kobj_remove(pd->kobj_wqueue);

	if (class_pktcdvd)

		class_device_destroy(class_pktcdvd, pd->pkt_dev);

		device_destroy(class_pktcdvd, pd->pkt_dev);

}

include/linux/pktcdvd.h

+1 −1
Original line number Diff line number Diff line
@@ -290,7 +290,7 @@ struct pktcdvd_device 
	int			write_congestion_off;

	int			write_congestion_on;



	struct class_device	*clsdev;	/* sysfs pktcdvd[0-7] class dev */

	struct device		*dev;		/* sysfs pktcdvd[0-7] dev */

	struct pktcdvd_kobj	*kobj_stat;	/* sysfs pktcdvd[0-7]/stat/     */

	struct pktcdvd_kobj	*kobj_wqueue;	/* sysfs pktcdvd[0-7]/write_queue/ */

CRA Git | Maintained and supported by SUSTech CRA and CCSE