Home » Mailing list archives » linux-kernel » 2010 » October » 26

[PATCH 22/30] staging/vme/vme_user: use __dev{init,exit} for .probe and .remove

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Emilio G. Cota
Subject: [PATCH 22/30] staging/vme/vme_user: use __dev{init,exit} for .probe and .remove
Date: Monday, October 25, 2010 - 6:11 pm

From: Emilio G. Cota <cota@braap.org>

Signed-off-by: Emilio G. Cota <cota@braap.org>
---
 drivers/staging/vme/devices/vme_user.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/staging/vme/devices/vme_user.c b/drivers/staging/vme/devices/vme_user.c
index a7b97be..5def455 100644
--- a/drivers/staging/vme/devices/vme_user.c
+++ b/drivers/staging/vme/devices/vme_user.c
@@ -134,8 +134,8 @@ static ssize_t vme_user_write(struct file *, const char __user *, size_t, loff_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,
@@ -593,7 +593,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),
 };
 
 
@@ -663,7 +663,7 @@ 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];
@@ -838,7 +838,7 @@ 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;
 
-- 
1.7.1

--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
[re-send][-next] staging/vme: various fixes + new driver m ..., Emilio G. Cota, (Mon Oct 25, 6:10 pm)
[PATCH 01/30] staging/vme: style: convert '&amp;(foo)' to '&amp;foo', Emilio G. Cota, (Mon Oct 25, 6:10 pm)
[PATCH 02/30] staging/vme_user: return the appropriate err ..., Emilio G. Cota, (Mon Oct 25, 6:10 pm)
[PATCH 03/30] staging/vme_user: remove unreachable line, Emilio G. Cota, (Mon Oct 25, 6:10 pm)
[PATCH 04/30] staging/vme: allow non-dynamic allocation of ..., Emilio G. Cota, (Mon Oct 25, 6:10 pm)
[PATCH 05/30] staging/vme: fix bogus clearing of the bus n ..., Emilio G. Cota, (Mon Oct 25, 6:10 pm)
[PATCH 06/30] staging/vme/tsi148: use list_for_each_safe w ..., Emilio G. Cota, (Mon Oct 25, 6:10 pm)
[PATCH 07/30] staging/vme/tsi148: remove double freeing of ..., Emilio G. Cota, (Mon Oct 25, 6:10 pm)
[PATCH 08/30] staging/vme/tsi148: fix warning in free_irq, Emilio G. Cota, (Mon Oct 25, 6:10 pm)
[PATCH 09/30] staging/vme: fill in struct device's .releas ..., Emilio G. Cota, (Mon Oct 25, 6:10 pm)
[PATCH 10/30] staging/vme/tsi148: remove unreachable line, Emilio G. Cota, (Mon Oct 25, 6:10 pm)
[PATCH 11/30] staging/vme/tsi148: declare static functions ..., Emilio G. Cota, (Mon Oct 25, 6:10 pm)
[PATCH 12/30] staging/vme/ca91cx42: declare static functio ..., Emilio G. Cota, (Mon Oct 25, 6:10 pm)
[PATCH 13/30] staging/vme_user: declare private variables ..., Emilio G. Cota, (Mon Oct 25, 6:10 pm)
[PATCH 14/30] staging/vme_user: use an unsigned int for co ..., Emilio G. Cota, (Mon Oct 25, 6:11 pm)
[PATCH 15/30] staging/vme_user: remove __iomem marking fro ..., Emilio G. Cota, (Mon Oct 25, 6:11 pm)
[PATCH 16/30] staging/vme_user: mark user-space buffers wi ..., Emilio G. Cota, (Mon Oct 25, 6:11 pm)
[PATCH 17/30] staging/vme: mark struct vme_master_resource ..., Emilio G. Cota, (Mon Oct 25, 6:11 pm)
[PATCH 18/30] staging/vme/tsi148: mark the registers' base ..., Emilio G. Cota, (Mon Oct 25, 6:11 pm)
[PATCH 19/30] staging/vme/ca91cx42: mark the registers' ba ..., Emilio G. Cota, (Mon Oct 25, 6:11 pm)
[PATCH 20/30] staging/vme: trivial: rename vme_bus_num_mtx ..., Emilio G. Cota, (Mon Oct 25, 6:11 pm)
[PATCH 21/30] staging/vme: keep a list of registered buses ..., Emilio G. Cota, (Mon Oct 25, 6:11 pm)
[PATCH 22/30] staging/vme/vme_user: use __dev{init,exit} f ..., Emilio G. Cota, (Mon Oct 25, 6:11 pm)
[PATCH 23/30] staging/vme_user: fix usage of the slave res ..., Emilio G. Cota, (Mon Oct 25, 6:11 pm)
[PATCH 24/30] staging/vme_user: remove unnecessary call to ..., Emilio G. Cota, (Mon Oct 25, 6:11 pm)
[PATCH 25/30] staging/vme_user: add missing calls to vme_m ..., Emilio G. Cota, (Mon Oct 25, 6:11 pm)
[PATCH 26/30] staging/vme: move all contents of vme_bridge ..., Emilio G. Cota, (Mon Oct 25, 6:11 pm)
[PATCH 27/30] staging/vme: rework the bus model, Emilio G. Cota, (Mon Oct 25, 6:11 pm)
[PATCH 28/30] staging/vme: convert vme_* users to vme_*_ng, Emilio G. Cota, (Mon Oct 25, 6:11 pm)
[PATCH 29/30] staging/vme: remove unused vme_* functions a ..., Emilio G. Cota, (Mon Oct 25, 6:11 pm)
[PATCH 30/30] staging/vme: remove _ng suffixes, Emilio G. Cota, (Mon Oct 25, 6:11 pm)
Re: [PATCH 01/30] staging/vme: style: convert '&amp;(foo)' to ..., Martyn Welch, (Wed Oct 27, 2:17 am)
Re: [PATCH 02/30] staging/vme_user: return the appropriate ..., Martyn Welch, (Wed Oct 27, 2:25 am)
Re: [PATCH 04/30] staging/vme: allow non-dynamic allocatio ..., Martyn Welch, (Wed Oct 27, 2:41 am)
Re: [PATCH 06/30] staging/vme/tsi148: use list_for_each_sa ..., Martyn Welch, (Wed Oct 27, 2:51 am)
Re: [PATCH 07/30] staging/vme/tsi148: remove double freein ..., Martyn Welch, (Wed Oct 27, 3:01 am)
Re: [PATCH 08/30] staging/vme/tsi148: fix warning in free_irq, Martyn Welch, (Wed Oct 27, 3:23 am)
Re: [PATCH 09/30] staging/vme: fill in struct device's .re ..., Martyn Welch, (Wed Oct 27, 3:54 am)
Re: [PATCH 10/30] staging/vme/tsi148: remove unreachable line, Martyn Welch, (Wed Oct 27, 4:06 am)
Re: [PATCH 11/30] staging/vme/tsi148: declare static funct ..., Martyn Welch, (Wed Oct 27, 4:23 am)
Re: [PATCH 12/30] staging/vme/ca91cx42: declare static fun ..., Martyn Welch, (Wed Oct 27, 4:24 am)
Re: [PATCH 14/30] staging/vme_user: use an unsigned int fo ..., Martyn Welch, (Wed Oct 27, 4:29 am)
Re: [PATCH 15/30] staging/vme_user: remove __iomem marking ..., Martyn Welch, (Wed Oct 27, 5:20 am)
Re: [PATCH 16/30] staging/vme_user: mark user-space buffer ..., Martyn Welch, (Wed Oct 27, 5:20 am)
Re: [PATCH 17/30] staging/vme: mark struct vme_master_reso ..., Martyn Welch, (Wed Oct 27, 5:20 am)
Re: [PATCH 18/30] staging/vme/tsi148: mark the registers' ..., Martyn Welch, (Wed Oct 27, 5:20 am)
Re: [PATCH 19/30] staging/vme/ca91cx42: mark the registers ..., Martyn Welch, (Wed Oct 27, 5:20 am)
Re: [PATCH 24/30] staging/vme_user: remove unnecessary cal ..., Martyn Welch, (Wed Oct 27, 5:24 am)
Re: [PATCH 09/30] staging/vme: fill in struct device's .re ..., Emilio G. Cota, (Wed Oct 27, 7:46 am)
Re: [PATCH 09/30] staging/vme: fill in struct device's .re ..., Martyn Welch, (Wed Oct 27, 8:03 am)
Re: [PATCH 04/30] staging/vme: allow non-dynamic allocatio ..., Emilio G. Cota, (Wed Oct 27, 8:13 am)
Re: [PATCH 09/30] staging/vme: fill in struct device's .re ..., Greg KH, (Wed Oct 27, 6:17 pm)
Re: [PATCH 09/30] staging/vme: fill in struct device's .re ..., Emilio G. Cota, (Wed Oct 27, 11:07 pm)
Re: [PATCH 09/30] staging/vme: fill in struct device's .re ..., Greg KH, (Thu Oct 28, 10:56 am)
Re: [PATCH 04/30] staging/vme: allow non-dynamic allocatio ..., Emilio G. Cota, (Wed Nov 3, 8:40 pm)
Re: [PATCH 27/30] staging/vme: rework the bus model, Emilio G. Cota, (Wed Nov 3, 9:16 pm)
Re: [PATCH 04/30] staging/vme: allow non-dynamic allocatio ..., Martyn Welch, (Fri Nov 5, 9:29 am)
Re: [re-send][-next] staging/vme: various fixes + new driv ..., Greg KH, (Tue Nov 9, 4:12 pm)
[PATCH 00/17] Series short description, Martyn Welch, (Fri Nov 12, 4:13 am)
[PATCH 01/17] staging/vme: style: convert '&amp;(foo)' to '&amp;foo', Martyn Welch, (Fri Nov 12, 4:14 am)
[PATCH 02/17] staging/vme_user: return the appropriate err ..., Martyn Welch, (Fri Nov 12, 4:14 am)
[PATCH 03/17] staging/vme_user: remove unreachable line, Martyn Welch, (Fri Nov 12, 4:14 am)
[PATCH 04/17] staging/vme: fix bogus clearing of the bus n ..., Martyn Welch, (Fri Nov 12, 4:14 am)
[PATCH 05/17] staging/vme/tsi148: use list_for_each_safe w ..., Martyn Welch, (Fri Nov 12, 4:14 am)
Re: [PATCH 00/17] Series short description, Martyn Welch, (Fri Nov 12, 4:23 am)
Re: [PATCH 00/17] Series short description, Emilio G. Cota, (Fri Nov 12, 8:11 am)
Re: [PATCH 00/17] Series short description, Martyn Welch, (Fri Nov 12, 8:52 am)
Re: [PATCH 00/17] Series short description, Greg KH, (Tue Nov 16, 12:40 pm)
[PATCH] staging/vme/vme_user: use __dev{init, exit} for .p ..., Martyn Welch, (Fri Dec 3, 6:44 am)
[PATCH] staging/vme_user: add missing calls to vme_master_ ..., Martyn Welch, (Fri Dec 3, 7:20 am)
Re: [PATCH] staging/vme_user: add missing calls to vme_mas ..., Greg KH, (Fri Dec 3, 7:44 am)
Re: [PATCH] staging/vme_user: add missing calls to vme_mas ..., Martyn Welch, (Fri Dec 3, 8:29 am)