From f21a8247641329c40ab17b2d70c492c060bb3573 Mon Sep 17 00:00:00 2001 From: Bill Pemberton Date: Mon, 19 Nov 2012 13:26:52 -0500 Subject: [PATCH] staging: vme: remove use of __devexit CONFIG_HOTPLUG is going away as an option so __devexit is no longer needed. Signed-off-by: Bill Pemberton Cc: Martyn Welch Cc: Manohar Vanga Signed-off-by: Greg Kroah-Hartman --- drivers/staging/vme/devices/vme_pio2_core.c | 4 ++-- drivers/staging/vme/devices/vme_user.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/staging/vme/devices/vme_pio2_core.c b/drivers/staging/vme/devices/vme_pio2_core.c index 35880a3353fd..0331178ca3b3 100644 --- a/drivers/staging/vme/devices/vme_pio2_core.c +++ b/drivers/staging/vme/devices/vme_pio2_core.c @@ -43,7 +43,7 @@ static bool loopback; static int pio2_match(struct vme_dev *); static int pio2_probe(struct vme_dev *); -static int __devexit pio2_remove(struct vme_dev *); +static int pio2_remove(struct vme_dev *); static int pio2_get_led(struct pio2_card *card) { @@ -455,7 +455,7 @@ err_struct: return retval; } -static int __devexit pio2_remove(struct vme_dev *vdev) +static int pio2_remove(struct vme_dev *vdev) { int vec; int i; diff --git a/drivers/staging/vme/devices/vme_user.c b/drivers/staging/vme/devices/vme_user.c index e36211056272..4ef852c4c4e1 100644 --- a/drivers/staging/vme/devices/vme_user.c +++ b/drivers/staging/vme/devices/vme_user.c @@ -138,7 +138,7 @@ static long vme_user_unlocked_ioctl(struct file *, unsigned int, unsigned long); static int vme_user_match(struct vme_dev *); static int vme_user_probe(struct vme_dev *); -static int __devexit vme_user_remove(struct vme_dev *); +static int vme_user_remove(struct vme_dev *); static const struct file_operations vme_user_fops = { .open = vme_user_open, @@ -846,7 +846,7 @@ err_dev: return err; } -static int __devexit vme_user_remove(struct vme_dev *dev) +static int vme_user_remove(struct vme_dev *dev) { int i; -- 2.20.1