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 094fdc3..0258035 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 6cc30dc..7c8c603 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 b747e39..aab234e 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 cc8ccd7..99e06f6 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 d7c6511..6375e80 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,