summaryrefslogtreecommitdiffstats
path: root/drivers/w1/masters/matrox_w1.c
diff options
context:
space:
mode:
authorBill Pemberton <wfp5p@virginia.edu>2012-11-19 19:26:23 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-11-21 21:42:25 +0100
commit82849a93aad04c5a438d811081341b245fdade8c (patch)
treeb08b64b097d6f65067de60ed40b1610aae2b0f47 /drivers/w1/masters/matrox_w1.c
parentw1: remove use of __devinit (diff)
downloadlinux-82849a93aad04c5a438d811081341b245fdade8c.tar.xz
linux-82849a93aad04c5a438d811081341b245fdade8c.zip
w1: remove use of __devexit
CONFIG_HOTPLUG is going away as an option so __devexit 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>
Diffstat (limited to 'drivers/w1/masters/matrox_w1.c')
-rw-r--r--drivers/w1/masters/matrox_w1.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/w1/masters/matrox_w1.c b/drivers/w1/masters/matrox_w1.c
index 1197f7ec54f2..d8667b0212d7 100644
--- a/drivers/w1/masters/matrox_w1.c
+++ b/drivers/w1/masters/matrox_w1.c
@@ -49,7 +49,7 @@ static struct pci_device_id matrox_w1_tbl[] = {
MODULE_DEVICE_TABLE(pci, matrox_w1_tbl);
static int matrox_w1_probe(struct pci_dev *, const struct pci_device_id *);
-static void __devexit matrox_w1_remove(struct pci_dev *);
+static void matrox_w1_remove(struct pci_dev *);
static struct pci_driver matrox_w1_pci_driver = {
.name = "matrox_w1",
@@ -220,7 +220,7 @@ err_out_free_device:
return err;
}
-static void __devexit matrox_w1_remove(struct pci_dev *pdev)
+static void matrox_w1_remove(struct pci_dev *pdev)
{
struct matrox_device *dev = pci_get_drvdata(pdev);