staging: nvec: remove use of __devexit_p

CONFIG_HOTPLUG is going away as an option so __devexit_p is no longer
needed.

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Cc: Julian Andres Klode <jak@jak-linux.org>
Acked-by: Marc Dietrich <marvin24@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/nvec/nvec.c b/drivers/staging/nvec/nvec.c
index 094fdc366f30a21d767107303b902294cd26358f..0258035b4b0ef3b93a07faf694d69d245bc2c8bf 100644 (file)
--- a/drivers/staging/nvec/nvec.c
+++ b/drivers/staging/nvec/nvec.c
@@ -909,7 +909,7 @@ MODULE_DEVICE_TABLE(of, nvidia_nvec_of_match);
 
 static struct platform_driver nvec_device_driver = {
        .probe   = tegra_nvec_probe,
-       .remove  = __devexit_p(tegra_nvec_remove),
+       .remove  = tegra_nvec_remove,
        .driver  = {
                .name = "nvec",
                .owner = THIS_MODULE,

diff --git a/drivers/staging/nvec/nvec_kbd.c b/drivers/staging/nvec/nvec_kbd.c
index 6cc30dcd8306506a4115d96a22440b09014a1b83..7c8c603da705f6e401b11baa9c7aa9beaeb66471 100644 (file)
--- a/drivers/staging/nvec/nvec_kbd.c
+++ b/drivers/staging/nvec/nvec_kbd.c
@@ -169,7 +169,7 @@ static int __devexit nvec_kbd_remove(struct platform_device *pdev)
 
 static struct platform_driver nvec_kbd_driver = {
        .probe  = nvec_kbd_probe,
-       .remove = __devexit_p(nvec_kbd_remove),
+       .remove = nvec_kbd_remove,
        .driver = {
                .name = "nvec-kbd",
                .owner = THIS_MODULE,

diff --git a/drivers/staging/nvec/nvec_paz00.c b/drivers/staging/nvec/nvec_paz00.c
index b747e39ff94d606f9263bd24d89fd23fa7064ee6..aab234e97d0b9713fb2c06a784220a937ea1adf4 100644 (file)
--- a/drivers/staging/nvec/nvec_paz00.c
+++ b/drivers/staging/nvec/nvec_paz00.c
@@ -83,7 +83,7 @@ static int __devexit nvec_paz00_remove(struct platform_device *pdev)
 
 static struct platform_driver nvec_paz00_driver = {
        .probe  = nvec_paz00_probe,
-       .remove = __devexit_p(nvec_paz00_remove),
+       .remove = nvec_paz00_remove,
        .driver = {
                .name  = "nvec-paz00",
                .owner = THIS_MODULE,

diff --git a/drivers/staging/nvec/nvec_power.c b/drivers/staging/nvec/nvec_power.c
index cc8ccd75e7f4ab879e4e79803540aefd42606cb2..99e06f661c190c22fcd14b8070e8ed115378fbfe 100644 (file)
--- a/drivers/staging/nvec/nvec_power.c
+++ b/drivers/staging/nvec/nvec_power.c
@@ -425,7 +425,7 @@ static int __devexit nvec_power_remove(struct platform_device *pdev)
 
 static struct platform_driver nvec_power_driver = {
        .probe = nvec_power_probe,
-       .remove = __devexit_p(nvec_power_remove),
+       .remove = nvec_power_remove,
        .driver = {
                   .name = "nvec-power",
                   .owner = THIS_MODULE,

diff --git a/drivers/staging/nvec/nvec_ps2.c b/drivers/staging/nvec/nvec_ps2.c
index d7c65110213111e76702601b2d89d4ba6618fecc..6375e80e77afa8382714c0c362514780bb1c42fd 100644 (file)
--- a/drivers/staging/nvec/nvec_ps2.c
+++ b/drivers/staging/nvec/nvec_ps2.c
@@ -164,7 +164,7 @@ static const SIMPLE_DEV_PM_OPS(nvec_mouse_pm_ops, nvec_mouse_suspend,
 
 static struct platform_driver nvec_mouse_driver = {
        .probe  = nvec_mouse_probe,
-       .remove = __devexit_p(nvec_mouse_remove),
+       .remove = nvec_mouse_remove,
        .driver = {
                .name = "nvec-mouse",
                .owner = THIS_MODULE,