lkml.org 
[lkml]   [2005]   [Jun]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH] fix up ipmi code after class_simple.c removal
    Date
    From
    [PATCH] fix up ipmi code after class_simple.c removal

    Cc: Corey Minyard <minyard@acm.org>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    commit eb51b65005737b777e0709683b061d5f82aefd97
    tree 1e458e31a6c07da7c245c3e10293c7c7459c390f
    parent 733a366c34aea88def75dee478f92233410ab3c4
    author Andrew Morton <akpm@osdl.org> Thu, 05 May 2005 15:06:38 -0700
    committer Greg Kroah-Hartman <gregkh@suse.de> Mon, 20 Jun 2005 15:15:12 -0700

    drivers/char/ipmi/ipmi_devintf.c | 14 +++++++-------
    1 files changed, 7 insertions(+), 7 deletions(-)

    diff --git a/drivers/char/ipmi/ipmi_devintf.c b/drivers/char/ipmi/ipmi_devintf.c
    --- a/drivers/char/ipmi/ipmi_devintf.c
    +++ b/drivers/char/ipmi/ipmi_devintf.c
    @@ -520,7 +520,7 @@ MODULE_PARM_DESC(ipmi_major, "Sets the m
    " interface. Other values will set the major device number"
    " to that value.");

    -static struct class_simple *ipmi_class;
    +static struct class *ipmi_class;

    static void ipmi_new_smi(int if_num)
    {
    @@ -529,12 +529,12 @@ static void ipmi_new_smi(int if_num)
    devfs_mk_cdev(dev, S_IFCHR | S_IRUSR | S_IWUSR,
    "ipmidev/%d", if_num);

    - class_simple_device_add(ipmi_class, dev, NULL, "ipmi%d", if_num);
    + class_device_create(ipmi_class, dev, NULL, "ipmi%d", if_num);
    }

    static void ipmi_smi_gone(int if_num)
    {
    - class_simple_device_remove(MKDEV(ipmi_major, if_num));
    + class_device_destroy(ipmi_class, MKDEV(ipmi_major, if_num));
    devfs_remove("ipmidev/%d", if_num);
    }

    @@ -555,7 +555,7 @@ static __init int init_ipmi_devintf(void
    printk(KERN_INFO "ipmi device interface version "
    IPMI_DEVINTF_VERSION "\n");

    - ipmi_class = class_simple_create(THIS_MODULE, "ipmi");
    + ipmi_class = class_create(THIS_MODULE, "ipmi");
    if (IS_ERR(ipmi_class)) {
    printk(KERN_ERR "ipmi: can't register device class\n");
    return PTR_ERR(ipmi_class);
    @@ -563,7 +563,7 @@ static __init int init_ipmi_devintf(void

    rv = register_chrdev(ipmi_major, DEVICE_NAME, &ipmi_fops);
    if (rv < 0) {
    - class_simple_destroy(ipmi_class);
    + class_destroy(ipmi_class);
    printk(KERN_ERR "ipmi: can't get major %d\n", ipmi_major);
    return rv;
    }
    @@ -577,7 +577,7 @@ static __init int init_ipmi_devintf(void
    rv = ipmi_smi_watcher_register(&smi_watcher);
    if (rv) {
    unregister_chrdev(ipmi_major, DEVICE_NAME);
    - class_simple_destroy(ipmi_class);
    + class_destroy(ipmi_class);
    printk(KERN_WARNING "ipmi: can't register smi watcher\n");
    return rv;
    }
    @@ -588,7 +588,7 @@ module_init(init_ipmi_devintf);

    static __exit void cleanup_ipmi(void)
    {
    - class_simple_destroy(ipmi_class);
    + class_destroy(ipmi_class);
    ipmi_smi_watcher_unregister(&smi_watcher);
    devfs_remove(DEVICE_NAME);
    unregister_chrdev(ipmi_major, DEVICE_NAME);
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2005-06-21 04:01    [W:0.046 / U:149.740 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site