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
...@@ -301,18 +301,16 @@ static struct kobj_type kobj_pkt_type_wqueue = { ...@@ -301,18 +301,16 @@ static struct kobj_type kobj_pkt_type_wqueue = {
static void pkt_sysfs_dev_new(struct pktcdvd_device *pd) static void pkt_sysfs_dev_new(struct pktcdvd_device *pd)
{ {
if (class_pktcdvd) { if (class_pktcdvd) {
pd->clsdev = class_device_create(class_pktcdvd, pd->dev = device_create(class_pktcdvd, NULL, pd->pkt_dev, "%s", pd->name);
NULL, pd->pkt_dev, if (IS_ERR(pd->dev))
NULL, "%s", pd->name); pd->dev = NULL;
if (IS_ERR(pd->clsdev))
pd->clsdev = NULL;
} }
if (pd->clsdev) { if (pd->dev) {
pd->kobj_stat = pkt_kobj_create(pd, "stat", pd->kobj_stat = pkt_kobj_create(pd, "stat",
&pd->clsdev->kobj, &pd->dev->kobj,
&kobj_pkt_type_stat); &kobj_pkt_type_stat);
pd->kobj_wqueue = pkt_kobj_create(pd, "write_queue", pd->kobj_wqueue = pkt_kobj_create(pd, "write_queue",
&pd->clsdev->kobj, &pd->dev->kobj,
&kobj_pkt_type_wqueue); &kobj_pkt_type_wqueue);
} }
} }
...@@ -322,7 +320,7 @@ static void pkt_sysfs_dev_remove(struct pktcdvd_device *pd) ...@@ -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_stat);
pkt_kobj_remove(pd->kobj_wqueue); pkt_kobj_remove(pd->kobj_wqueue);
if (class_pktcdvd) if (class_pktcdvd)
class_device_destroy(class_pktcdvd, pd->pkt_dev); device_destroy(class_pktcdvd, pd->pkt_dev);
} }
......
...@@ -290,7 +290,7 @@ struct pktcdvd_device ...@@ -290,7 +290,7 @@ struct pktcdvd_device
int write_congestion_off; int write_congestion_off;
int write_congestion_on; 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_stat; /* sysfs pktcdvd[0-7]/stat/ */
struct pktcdvd_kobj *kobj_wqueue; /* sysfs pktcdvd[0-7]/write_queue/ */ struct pktcdvd_kobj *kobj_wqueue; /* sysfs pktcdvd[0-7]/write_queue/ */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment