CONFIG_HOTPLUG is going away as an option so __devinit is no longer needed.
Signed-off-by: Bill Pemberton <[email protected]> Cc: Martyn Welch <[email protected]> Cc: Manohar Vanga <[email protected]> Cc: [email protected] --- drivers/staging/vme/devices/vme_pio2.h | 2 +- drivers/staging/vme/devices/vme_pio2_core.c | 4 ++-- drivers/staging/vme/devices/vme_pio2_gpio.c | 2 +- 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 72d9ce0..d5d94c4 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 35c5a14..35880a3 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 ad76a47..69d8805 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 8209c2d..e3621105 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]; -- 1.8.0 _______________________________________________ devel mailing list [email protected] http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
