diff options
| author | Bill Pemberton <wfp5p@virginia.edu> | 2012-11-19 13:21:56 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-21 15:05:00 -0800 |
| commit | d7e530d26ba3dc59753e0d0b04fecdbb1f394c38 (patch) | |
| tree | d9da77186505a960f79ca91dfb6e1c65ea222bc1 | |
| parent | 59cb218e7d3e58dd466f14fe341901695e6a65f4 (diff) | |
staging: vme: remove use of __devinit
CONFIG_HOTPLUG is going away as an option so __devinit is no longer
needed.
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Cc: Martyn Welch <martyn.welch@ge.com>
Cc: Manohar Vanga <manohar.vanga@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/vme/devices/vme_pio2.h | 2 | ||||
| -rw-r--r-- | drivers/staging/vme/devices/vme_pio2_core.c | 4 | ||||
| -rw-r--r-- | drivers/staging/vme/devices/vme_pio2_gpio.c | 2 | ||||
| -rw-r--r-- | drivers/staging/vme/devices/vme_user.c | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/drivers/staging/vme/devices/vme_pio2.h b/drivers/staging/vme/devices/vme_pio2.h index 72d9ce0bcb45..d5d94c43c074 100644 --- a/drivers/staging/vme/devices/vme_pio2.h +++ b/drivers/staging/vme/devices/vme_pio2.h @@ -243,7 +243,7 @@ struct pio2_card { int pio2_cntr_reset(struct pio2_card *); int pio2_gpio_reset(struct pio2_card *); -int __devinit pio2_gpio_init(struct pio2_card *); +int pio2_gpio_init(struct pio2_card *); void pio2_gpio_exit(struct pio2_card *); #endif /* _VME_PIO2_H_ */ diff --git a/drivers/staging/vme/devices/vme_pio2_core.c b/drivers/staging/vme/devices/vme_pio2_core.c index 35c5a147849f..35880a3353fd 100644 --- a/drivers/staging/vme/devices/vme_pio2_core.c +++ b/drivers/staging/vme/devices/vme_pio2_core.c @@ -42,7 +42,7 @@ static int variant_num; static bool loopback; static int pio2_match(struct vme_dev *); -static int __devinit pio2_probe(struct vme_dev *); +static int pio2_probe(struct vme_dev *); static int __devexit pio2_remove(struct vme_dev *); static int pio2_get_led(struct pio2_card *card) @@ -222,7 +222,7 @@ static int pio2_match(struct vme_dev *vdev) return 1; } -static int __devinit pio2_probe(struct vme_dev *vdev) +static int pio2_probe(struct vme_dev *vdev) { struct pio2_card *card; int retval; diff --git a/drivers/staging/vme/devices/vme_pio2_gpio.c b/drivers/staging/vme/devices/vme_pio2_gpio.c index ad76a477825b..69d880517e07 100644 --- a/drivers/staging/vme/devices/vme_pio2_gpio.c +++ b/drivers/staging/vme/devices/vme_pio2_gpio.c @@ -186,7 +186,7 @@ int pio2_gpio_reset(struct pio2_card *card) return 0; } -int __devinit pio2_gpio_init(struct pio2_card *card) +int pio2_gpio_init(struct pio2_card *card) { int retval = 0; char *label; diff --git a/drivers/staging/vme/devices/vme_user.c b/drivers/staging/vme/devices/vme_user.c index 8209c2d3c151..e36211056272 100644 --- a/drivers/staging/vme/devices/vme_user.c +++ b/drivers/staging/vme/devices/vme_user.c @@ -137,7 +137,7 @@ 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 vme_user_match(struct vme_dev *); -static int __devinit vme_user_probe(struct vme_dev *); +static int vme_user_probe(struct vme_dev *); static int __devexit vme_user_remove(struct vme_dev *); static const struct file_operations vme_user_fops = { @@ -673,7 +673,7 @@ static int vme_user_match(struct vme_dev *vdev) * 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 __devinit vme_user_probe(struct vme_dev *vdev) +static int vme_user_probe(struct vme_dev *vdev) { int i, err; char name[12]; |