aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/vme
diff options
context:
space:
mode:
authorEmilio G. Cota <cota@braap.org>2010-12-03 08:44:15 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2010-12-03 14:51:51 -0500
commit4740a0846069f6d4cbba9e328a9d92e6dd76110d (patch)
tree931a29ea2baf82371ace2771aeb6e1e389c61e1b /drivers/staging/vme
parent1daa38d379932bde0d2036c2e10ced3e8842b74f (diff)
staging/vme/vme_user: use __dev{init, exit} for .probe and .remove
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>
Diffstat (limited to 'drivers/staging/vme')
-rw-r--r--drivers/staging/vme/devices/vme_user.c12
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 dc7175bdfcf..db445ed164c 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,
135static loff_t vme_user_llseek(struct file *, loff_t, int); 135static loff_t vme_user_llseek(struct file *, loff_t, int);
136static long vme_user_unlocked_ioctl(struct file *, unsigned int, unsigned long); 136static long vme_user_unlocked_ioctl(struct file *, unsigned int, unsigned long);
137 137
138static int __init vme_user_probe(struct device *, int, int); 138static int __devinit vme_user_probe(struct device *, int, int);
139static int __exit vme_user_remove(struct device *, int, int); 139static int __devexit vme_user_remove(struct device *, int, int);
140 140
141static struct file_operations vme_user_fops = { 141static struct file_operations vme_user_fops = {
142 .open = vme_user_open, 142 .open = vme_user_open,
@@ -596,7 +596,7 @@ static void buf_unalloc(int num)
596static struct vme_driver vme_user_driver = { 596static struct vme_driver vme_user_driver = {
597 .name = driver_name, 597 .name = driver_name,
598 .probe = vme_user_probe, 598 .probe = vme_user_probe,
599 .remove = vme_user_remove, 599 .remove = __devexit_p(vme_user_remove),
600}; 600};
601 601
602 602
@@ -666,7 +666,8 @@ err_nocard:
666 * as practical. We will therefore reserve the buffers and request the images 666 * as practical. We will therefore reserve the buffers and request the images
667 * here so that we don't have to do it later. 667 * here so that we don't have to do it later.
668 */ 668 */
669static int __init vme_user_probe(struct device *dev, int cur_bus, int cur_slot) 669static int __devinit vme_user_probe(struct device *dev, int cur_bus,
670 int cur_slot)
670{ 671{
671 int i, err; 672 int i, err;
672 char name[12]; 673 char name[12];
@@ -841,7 +842,8 @@ err_dev:
841 return err; 842 return err;
842} 843}
843 844
844static int __exit vme_user_remove(struct device *dev, int cur_bus, int cur_slot) 845static int __devexit vme_user_remove(struct device *dev, int cur_bus,
846 int cur_slot)
845{ 847{
846 int i; 848 int i;
847 849