lkml.org 
[lkml]   [2008]   [Jan]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 026/196] pktcdvd: Convert from class_device to device for block/pktcdvd
    Date
    From: Tony Jones <tonyj@suse.de>

    struct class_device is going away, this converts the code to use struct
    device instead.

    Signed-off-by: Tony Jones <tonyj@suse.de>
    Cc: Peter Osterlund <petero2@telia.com>
    Cc: Kay Sievers <kay.sievers@vrfy.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    ---
    drivers/block/pktcdvd.c | 16 +++++++---------
    include/linux/pktcdvd.h | 2 +-
    2 files changed, 8 insertions(+), 10 deletions(-)

    diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c
    index 3535ef8..17da699 100644
    --- a/drivers/block/pktcdvd.c
    +++ b/drivers/block/pktcdvd.c
    @@ -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);
    }


    diff --git a/include/linux/pktcdvd.h b/include/linux/pktcdvd.h
    index 5ea4f05..04b4d73 100644
    --- a/include/linux/pktcdvd.h
    +++ b/include/linux/pktcdvd.h
    @@ -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/ */

    --
    1.5.3.8


    \
     
     \ /
      Last update: 2008-01-25 08:25    [W:4.042 / U:2.224 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site