w1: 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: Evgeniy Polyakov <zbr@ioremap.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/w1/masters/matrox_w1.c b/drivers/w1/masters/matrox_w1.c
index f667c26b219571e4409b167985605d79c56d9e8b..0a3c423a0c9d49b303724d65deee9d2d3c00cae6 100644 (file)
--- a/drivers/w1/masters/matrox_w1.c
+++ b/drivers/w1/masters/matrox_w1.c
@@ -55,7 +55,7 @@ static struct pci_driver matrox_w1_pci_driver = {
        .name = "matrox_w1",
        .id_table = matrox_w1_tbl,
        .probe = matrox_w1_probe,
-       .remove = __devexit_p(matrox_w1_remove),
+       .remove = matrox_w1_remove,
 };
 
 /*

diff --git a/drivers/w1/masters/omap_hdq.c b/drivers/w1/masters/omap_hdq.c
index ca8e60bb2f9cb386f454a33224d6cc7906a20fc7..652ca7f207e3cd1e4398d4f67af35784400f03ea 100644 (file)
--- a/drivers/w1/masters/omap_hdq.c
+++ b/drivers/w1/masters/omap_hdq.c
@@ -74,7 +74,7 @@ static int __devexit omap_hdq_remove(struct platform_device *pdev);
 
 static struct platform_driver omap_hdq_driver = {
        .probe =        omap_hdq_probe,
-       .remove =       __devexit_p(omap_hdq_remove),
+       .remove =       omap_hdq_remove,
        .driver =       {
                .name = "omap_hdq",
        },