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 024/196] mtd: Convert from class_device to device for MTD/mtdchar
    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: David Woodhouse <dwmw2@infradead.org>
    Cc: Kay Sievers <kay.sievers@vrfy.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    ---
    drivers/mtd/mtdchar.c | 12 +++++-------
    1 files changed, 5 insertions(+), 7 deletions(-)

    diff --git a/drivers/mtd/mtdchar.c b/drivers/mtd/mtdchar.c
    index 22ed96c..a0cee86 100644
    --- a/drivers/mtd/mtdchar.c
    +++ b/drivers/mtd/mtdchar.c
    @@ -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 = {
    --
    1.5.3.8


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