lkml.org 
[lkml]   [2010]   [Dec]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH] staging/vme/vme_user: use __dev{init, exit} for .probe and .remove
    From
    Date
    From: Emilio G. Cota <cota@braap.org>

    Signed-off-by: Emilio G. Cota <cota@braap.org>
    [martyn.welch@ge.com: Fixed checkpatch line length warnings]
    Signed-off-by: Martyn Welch <martyn.welch@ge.com>
    ---

    drivers/staging/vme/devices/vme_user.c | 12 +++++++-----
    1 files changed, 7 insertions(+), 5 deletions(-)


    diff --git a/drivers/staging/vme/devices/vme_user.c b/drivers/staging/vme/devices/vme_user.c
    index dc7175b..db445ed 100644
    --- a/drivers/staging/vme/devices/vme_user.c
    +++ b/drivers/staging/vme/devices/vme_user.c
    @@ -135,8 +135,8 @@ static ssize_t vme_user_write(struct file *, const char __user *, size_t,
    static loff_t vme_user_llseek(struct file *, loff_t, int);
    static long vme_user_unlocked_ioctl(struct file *, unsigned int, unsigned long);

    -static int __init vme_user_probe(struct device *, int, int);
    -static int __exit vme_user_remove(struct device *, int, int);
    +static int __devinit vme_user_probe(struct device *, int, int);
    +static int __devexit vme_user_remove(struct device *, int, int);

    static struct file_operations vme_user_fops = {
    .open = vme_user_open,
    @@ -596,7 +596,7 @@ static void buf_unalloc(int num)
    static struct vme_driver vme_user_driver = {
    .name = driver_name,
    .probe = vme_user_probe,
    - .remove = vme_user_remove,
    + .remove = __devexit_p(vme_user_remove),
    };


    @@ -666,7 +666,8 @@ err_nocard:
    * as practical. We will therefore reserve the buffers and request the images
    * here so that we don't have to do it later.
    */
    -static int __init vme_user_probe(struct device *dev, int cur_bus, int cur_slot)
    +static int __devinit vme_user_probe(struct device *dev, int cur_bus,
    + int cur_slot)
    {
    int i, err;
    char name[12];
    @@ -841,7 +842,8 @@ err_dev:
    return err;
    }

    -static int __exit vme_user_remove(struct device *dev, int cur_bus, int cur_slot)
    +static int __devexit vme_user_remove(struct device *dev, int cur_bus,
    + int cur_slot)
    {
    int i;


    --
    Martyn Welch (Principal Software Engineer) | Registered in England and
    GE Intelligent Platforms | Wales (3828642) at 100
    T +44(0)127322748 | Barbirolli Square, Manchester,
    E martyn.welch@ge.com | M2 3AB VAT:GB 927559189

    \
     
     \ /
      Last update: 2010-12-03 14:47    [W:0.022 / U:29.448 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site