Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-05 19:41:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

staging/vme/vme_user: use __dev{init, exit} for .probe and .remove

Browse Source 
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Emilio G. Cota 2010-12-03 13:44:15 +00:00 committed by Greg Kroah-Hartman
parent 1daa38d379
commit 4740a08460
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/staging/vme/devices/vme_user.c
View File

@ -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 loff_t vme_user_llseek(struct file *, loff_t, int);
static long vme_user_unlocked_ioctl(struct file *, unsigned int, unsigned long); static long vme_user_unlocked_ioctl(struct file *, unsigned int, unsigned long);
static int __init vme_user_probe(struct device *, int, int); static int __devinit vme_user_probe(struct device *, int, int);
static int __exit vme_user_remove(struct device *, int, int); static int __devexit vme_user_remove(struct device *, int, int);
static struct file_operations vme_user_fops = { static struct file_operations vme_user_fops = {
.open = vme_user_open, .open = vme_user_open,
@ -596,7 +596,7 @@ static void buf_unalloc(int num)
static struct vme_driver vme_user_driver = { static struct vme_driver vme_user_driver = {
.name = driver_name, .name = driver_name,
.probe = vme_user_probe, .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 * as practical. We will therefore reserve the buffers and request the images
* here so that we don't have to do it later. * 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; int i, err;
char name[12]; char name[12];
@ -841,7 +842,8 @@ err_dev:
return err; 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; int i;