staging: comedi: remove use of __devinit

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

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/comedi/drivers/8255_pci.c b/drivers/staging/comedi/drivers/8255_pci.c
index c897d39f6b2b847ef62cdced0054e6320b480c9f..448f18d7560a6086ed0293b46251357898e5e20f 100644 (file)
--- a/drivers/staging/comedi/drivers/8255_pci.c
+++ b/drivers/staging/comedi/drivers/8255_pci.c
@@ -213,7 +213,7 @@ static const void *pci_8255_find_boardinfo(struct comedi_device *dev,
        return NULL;
 }
 
-static int __devinit pci_8255_auto_attach(struct comedi_device *dev,
+static int pci_8255_auto_attach(struct comedi_device *dev,
                                          unsigned long context_unused)
 {
        struct pci_dev *pcidev = comedi_to_pci_dev(dev);
@@ -308,7 +308,7 @@ static struct comedi_driver pci_8255_driver = {
        .detach         = pci_8255_detach,
 };
 
-static int __devinit pci_8255_pci_probe(struct pci_dev *dev,
+static int pci_8255_pci_probe(struct pci_dev *dev,
                                        const struct pci_device_id *ent)
 {
        return comedi_pci_auto_config(dev, &pci_8255_driver);

diff --git a/drivers/staging/comedi/drivers/addi-data/addi_common.c b/drivers/staging/comedi/drivers/addi-data/addi_common.c
index 8c0fbf43a7ec3db5ab727393b3c9109b143ce861..90cc43263aee921204008fcff3d30dd4a16f7369 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/addi_common.c
+++ b/drivers/staging/comedi/drivers/addi-data/addi_common.c
@@ -93,7 +93,7 @@ static const void *addi_find_boardinfo(struct comedi_device *dev,
        return NULL;
 }
 
-static int __devinit addi_auto_attach(struct comedi_device *dev,
+static int addi_auto_attach(struct comedi_device *dev,
                                      unsigned long context_unused)
 {
        struct pci_dev *pcidev = comedi_to_pci_dev(dev);

diff --git a/drivers/staging/comedi/drivers/addi_apci_035.c b/drivers/staging/comedi/drivers/addi_apci_035.c
index 489d151fc0370806557f6b0ac7c41c526129f0e6..8e5e5faae4f35cfb2e81ff74f317a2df0ffc72fa 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_035.c
+++ b/drivers/staging/comedi/drivers/addi_apci_035.c
@@ -47,7 +47,7 @@ static struct comedi_driver apci035_driver = {
        .offset         = sizeof(struct addi_board),
 };
 
-static int __devinit apci035_pci_probe(struct pci_dev *dev,
+static int apci035_pci_probe(struct pci_dev *dev,
                                       const struct pci_device_id *ent)
 {
        return comedi_pci_auto_config(dev, &apci035_driver);

diff --git a/drivers/staging/comedi/drivers/addi_apci_1032.c b/drivers/staging/comedi/drivers/addi_apci_1032.c
index 9c2e7f745d67aac77e63fa45dbfa45ea7f89ee1c..15b660bc1a2a4105310c02e2f529f3cd861020f8 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_1032.c
+++ b/drivers/staging/comedi/drivers/addi_apci_1032.c
@@ -285,7 +285,7 @@ static int apci1032_di_insn_bits(struct comedi_device *dev,
        return insn->n;
 }
 
-static int __devinit apci1032_auto_attach(struct comedi_device *dev,
+static int apci1032_auto_attach(struct comedi_device *dev,
                                          unsigned long context_unused)
 {
        struct pci_dev *pcidev = comedi_to_pci_dev(dev);
@@ -369,7 +369,7 @@ static struct comedi_driver apci1032_driver = {
        .detach         = apci1032_detach,
 };
 
-static int __devinit apci1032_pci_probe(struct pci_dev *dev,
+static int apci1032_pci_probe(struct pci_dev *dev,
                                        const struct pci_device_id *ent)
 {
        return comedi_pci_auto_config(dev, &apci1032_driver);

diff --git a/drivers/staging/comedi/drivers/addi_apci_1500.c b/drivers/staging/comedi/drivers/addi_apci_1500.c
index 67f145d92814a1c9f91e31b1576017d7ee343ddb..80115ccb6c7d3b4e08d6a5962094fc093b3d2b23 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_1500.c
+++ b/drivers/staging/comedi/drivers/addi_apci_1500.c
@@ -47,7 +47,7 @@ static struct comedi_driver apci1500_driver = {
        .offset         = sizeof(struct addi_board),
 };
 
-static int __devinit apci1500_pci_probe(struct pci_dev *dev,
+static int apci1500_pci_probe(struct pci_dev *dev,
                                        const struct pci_device_id *ent)
 {
        return comedi_pci_auto_config(dev, &apci1500_driver);

diff --git a/drivers/staging/comedi/drivers/addi_apci_1516.c b/drivers/staging/comedi/drivers/addi_apci_1516.c
index 086445f558f3a6daef23b16196915414b2a94757..ac32e9fa98e6772d3a33defa9ce7a9bc760552c4 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_1516.c
+++ b/drivers/staging/comedi/drivers/addi_apci_1516.c
@@ -225,7 +225,7 @@ static const void *apci1516_find_boardinfo(struct comedi_device *dev,
        return NULL;
 }
 
-static int __devinit apci1516_auto_attach(struct comedi_device *dev,
+static int apci1516_auto_attach(struct comedi_device *dev,
                                          unsigned long context_unused)
 {
        struct pci_dev *pcidev = comedi_to_pci_dev(dev);
@@ -317,7 +317,7 @@ static struct comedi_driver apci1516_driver = {
        .detach         = apci1516_detach,
 };
 
-static int __devinit apci1516_pci_probe(struct pci_dev *dev,
+static int apci1516_pci_probe(struct pci_dev *dev,
                                        const struct pci_device_id *ent)
 {
        return comedi_pci_auto_config(dev, &apci1516_driver);

diff --git a/drivers/staging/comedi/drivers/addi_apci_1564.c b/drivers/staging/comedi/drivers/addi_apci_1564.c
index 1d51233ca78e97b32732fab36a812729708baf7f..d03579a1659ea66015cdffed981e21f3faab2c74 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_1564.c
+++ b/drivers/staging/comedi/drivers/addi_apci_1564.c
@@ -44,7 +44,7 @@ static struct comedi_driver apci1564_driver = {
        .offset         = sizeof(struct addi_board),
 };
 
-static int __devinit apci1564_pci_probe(struct pci_dev *dev,
+static int apci1564_pci_probe(struct pci_dev *dev,
                                        const struct pci_device_id *ent)
 {
        return comedi_pci_auto_config(dev, &apci1564_driver);

diff --git a/drivers/staging/comedi/drivers/addi_apci_16xx.c b/drivers/staging/comedi/drivers/addi_apci_16xx.c
index 07d7c9a5d6d19ed6df1d903c06961373fc79f3ce..05457875308611a51a2d82849ac1241694511dce 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_16xx.c
+++ b/drivers/staging/comedi/drivers/addi_apci_16xx.c
@@ -46,7 +46,7 @@ static struct comedi_driver apci16xx_driver = {
        .offset         = sizeof(struct addi_board),
 };
 
-static int __devinit apci16xx_pci_probe(struct pci_dev *dev,
+static int apci16xx_pci_probe(struct pci_dev *dev,
                                        const struct pci_device_id *ent)
 {
        return comedi_pci_auto_config(dev, &apci16xx_driver);

diff --git a/drivers/staging/comedi/drivers/addi_apci_1710.c b/drivers/staging/comedi/drivers/addi_apci_1710.c
index 5d263364dbc10e4cb6e246e6576a810aa1e58a85..1c9ed4785d07e8c29f4a3bdb161b777ca668a099 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_1710.c
+++ b/drivers/staging/comedi/drivers/addi_apci_1710.c
@@ -52,7 +52,7 @@ static const void *apci1710_find_boardinfo(struct comedi_device *dev,
        return NULL;
 }
 
-static int __devinit apci1710_auto_attach(struct comedi_device *dev,
+static int apci1710_auto_attach(struct comedi_device *dev,
                                          unsigned long context_unused)
 {
        struct pci_dev *pcidev = comedi_to_pci_dev(dev);
@@ -122,7 +122,7 @@ static struct comedi_driver apci1710_driver = {
        .detach         = apci1710_detach,
 };
 
-static int __devinit apci1710_pci_probe(struct pci_dev *dev,
+static int apci1710_pci_probe(struct pci_dev *dev,
                                        const struct pci_device_id *ent)
 {
        return comedi_pci_auto_config(dev, &apci1710_driver);

diff --git a/drivers/staging/comedi/drivers/addi_apci_2032.c b/drivers/staging/comedi/drivers/addi_apci_2032.c
index a80bf018b76274683886f6c90f5bb685e831f80b..f60720546e326e3a3bea08c0cb9c299062b20f43 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_2032.c
+++ b/drivers/staging/comedi/drivers/addi_apci_2032.c
@@ -41,7 +41,7 @@ static struct comedi_driver apci2032_driver = {
        .offset         = sizeof(struct addi_board),
 };
 
-static int __devinit apci2032_pci_probe(struct pci_dev *dev,
+static int apci2032_pci_probe(struct pci_dev *dev,
                                        const struct pci_device_id *ent)
 {
        return comedi_pci_auto_config(dev, &apci2032_driver);

diff --git a/drivers/staging/comedi/drivers/addi_apci_2200.c b/drivers/staging/comedi/drivers/addi_apci_2200.c
index 9271cfe1b2388a0e3a9d2bd36d201f3b79814427..b931e17e3f5de5bc6c9954941fb46517e55a3db8 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_2200.c
+++ b/drivers/staging/comedi/drivers/addi_apci_2200.c
@@ -39,7 +39,7 @@ static struct comedi_driver apci2200_driver = {
        .offset         = sizeof(struct addi_board),
 };
 
-static int __devinit apci2200_pci_probe(struct pci_dev *dev,
+static int apci2200_pci_probe(struct pci_dev *dev,
                                        const struct pci_device_id *ent)
 {
        return comedi_pci_auto_config(dev, &apci2200_driver);

diff --git a/drivers/staging/comedi/drivers/addi_apci_3120.c b/drivers/staging/comedi/drivers/addi_apci_3120.c
index 77a9fe933f0680db481b27634e031dee0c7f74f3..86e34c406e8279cedf9999872335dc44dbb63435 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_3120.c
+++ b/drivers/staging/comedi/drivers/addi_apci_3120.c
@@ -60,7 +60,7 @@ static const void *apci3120_find_boardinfo(struct comedi_device *dev,
        return NULL;
 }
 
-static int __devinit apci3120_auto_attach(struct comedi_device *dev,
+static int apci3120_auto_attach(struct comedi_device *dev,
                                          unsigned long context_unused)
 {
        struct pci_dev *pcidev = comedi_to_pci_dev(dev);
@@ -245,7 +245,7 @@ static struct comedi_driver apci3120_driver = {
        .detach         = apci3120_detach,
 };
 
-static int __devinit apci3120_pci_probe(struct pci_dev *dev,
+static int apci3120_pci_probe(struct pci_dev *dev,
                                        const struct pci_device_id *ent)
 {
        return comedi_pci_auto_config(dev, &apci3120_driver);

diff --git a/drivers/staging/comedi/drivers/addi_apci_3200.c b/drivers/staging/comedi/drivers/addi_apci_3200.c
index 59120cf88dbcefef54d6413a0b988fe19cba6d76..bce297308a530e4afafeca20a17fed5cfed6ef06 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_3200.c
+++ b/drivers/staging/comedi/drivers/addi_apci_3200.c
@@ -100,7 +100,7 @@ static struct comedi_driver apci3200_driver = {
        .offset         = sizeof(struct addi_board),
 };
 
-static int __devinit apci3200_pci_probe(struct pci_dev *dev,
+static int apci3200_pci_probe(struct pci_dev *dev,
                                        const struct pci_device_id *ent)
 {
        return comedi_pci_auto_config(dev, &apci3200_driver);

diff --git a/drivers/staging/comedi/drivers/addi_apci_3501.c b/drivers/staging/comedi/drivers/addi_apci_3501.c
index 530d352e4b6a75283115c21902f52e0b7cc54bd3..cff8ff16b0bdc0fa53cd54c596f4b1ce01387692 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_3501.c
+++ b/drivers/staging/comedi/drivers/addi_apci_3501.c
@@ -51,7 +51,7 @@ static struct comedi_driver apci3501_driver = {
        .offset         = sizeof(struct addi_board),
 };
 
-static int __devinit apci3501_pci_probe(struct pci_dev *dev,
+static int apci3501_pci_probe(struct pci_dev *dev,
                                        const struct pci_device_id *ent)
 {
        return comedi_pci_auto_config(dev, &apci3501_driver);

diff --git a/drivers/staging/comedi/drivers/addi_apci_3xxx.c b/drivers/staging/comedi/drivers/addi_apci_3xxx.c
index 4a3e346c359fcf178bb82e70ca1ac4fd2afdee4c..c4fa11df47c1e7c6053ddf6198371c8413d5e878 100644 (file)
--- a/drivers/staging/comedi/drivers/addi_apci_3xxx.c
+++ b/drivers/staging/comedi/drivers/addi_apci_3xxx.c
@@ -745,7 +745,7 @@ static struct comedi_driver apci3xxx_driver = {
        .offset         = sizeof(struct addi_board),
 };
 
-static int __devinit apci3xxx_pci_probe(struct pci_dev *dev,
+static int apci3xxx_pci_probe(struct pci_dev *dev,
                                        const struct pci_device_id *ent)
 {
        return comedi_pci_auto_config(dev, &apci3xxx_driver);

diff --git a/drivers/staging/comedi/drivers/adl_pci6208.c b/drivers/staging/comedi/drivers/adl_pci6208.c
index 67d7ba1e36b6a48cc0ec6a51e856a71cc5378461..d7ba5e32202e2ba73f098c9a4833c4dde23c7c04 100644 (file)
--- a/drivers/staging/comedi/drivers/adl_pci6208.c
+++ b/drivers/staging/comedi/drivers/adl_pci6208.c
@@ -174,7 +174,7 @@ static const void *pci6208_find_boardinfo(struct comedi_device *dev,
        return NULL;
 }
 
-static int __devinit pci6208_auto_attach(struct comedi_device *dev,
+static int pci6208_auto_attach(struct comedi_device *dev,
                                         unsigned long context_unused)
 {
        struct pci_dev *pcidev = comedi_to_pci_dev(dev);
@@ -264,7 +264,7 @@ static struct comedi_driver adl_pci6208_driver = {
        .detach         = pci6208_detach,
 };
 
-static int __devinit adl_pci6208_pci_probe(struct pci_dev *dev,
+static int adl_pci6208_pci_probe(struct pci_dev *dev,
                                           const struct pci_device_id *ent)
 {
        return comedi_pci_auto_config(dev, &adl_pci6208_driver);

diff --git a/drivers/staging/comedi/drivers/adl_pci7x3x.c b/drivers/staging/comedi/drivers/adl_pci7x3x.c
index 9ac356b6201d13a62d5b789d83ac67bbf3e9951c..e94f0db16630ee159599301f81d59b6569159d00 100644 (file)
--- a/drivers/staging/comedi/drivers/adl_pci7x3x.c
+++ b/drivers/staging/comedi/drivers/adl_pci7x3x.c
@@ -168,7 +168,7 @@ static const void *adl_pci7x3x_find_boardinfo(struct comedi_device *dev,
        return NULL;
 }
 
-static int __devinit adl_pci7x3x_auto_attach(struct comedi_device *dev,
+static int adl_pci7x3x_auto_attach(struct comedi_device *dev,
                                             unsigned long context_unused)
 {
        struct pci_dev *pcidev = comedi_to_pci_dev(dev);
@@ -296,7 +296,7 @@ static struct comedi_driver adl_pci7x3x_driver = {
        .detach         = adl_pci7x3x_detach,
 };
 
-static int __devinit adl_pci7x3x_pci_probe(struct pci_dev *dev,
+static int adl_pci7x3x_pci_probe(struct pci_dev *dev,
                                           const struct pci_device_id *ent)
 {
        return comedi_pci_auto_config(dev, &adl_pci7x3x_driver);

diff --git a/drivers/staging/comedi/drivers/adl_pci8164.c b/drivers/staging/comedi/drivers/adl_pci8164.c
index d5eb68b4f00f594583d69e57be9153e1627ee1c7..c8135fefe19d9a59cdd01c0b48811eea14490e93 100644 (file)
--- a/drivers/staging/comedi/drivers/adl_pci8164.c
+++ b/drivers/staging/comedi/drivers/adl_pci8164.c
@@ -212,7 +212,7 @@ static int adl_pci8164_insn_write_buf1(struct comedi_device *dev,
        return 2;
 }
 
-static int __devinit adl_pci8164_auto_attach(struct comedi_device *dev,
+static int adl_pci8164_auto_attach(struct comedi_device *dev,
                                             unsigned long context_unused)
 {
        struct pci_dev *pcidev = comedi_to_pci_dev(dev);
@@ -292,7 +292,7 @@ static struct comedi_driver adl_pci8164_driver = {
        .detach         = adl_pci8164_detach,
 };
 
-static int __devinit adl_pci8164_pci_probe(struct pci_dev *dev,
+static int adl_pci8164_pci_probe(struct pci_dev *dev,
                                           const struct pci_device_id *ent)
 {
        return comedi_pci_auto_config(dev, &adl_pci8164_driver);

diff --git a/drivers/staging/comedi/drivers/adl_pci9111.c b/drivers/staging/comedi/drivers/adl_pci9111.c
index 1fac2f71b2a861b518088ee32a07c6a0993f7ae7..d084db8fe0939007e3de64260f21ca410da8a740 100644 (file)
--- a/drivers/staging/comedi/drivers/adl_pci9111.c
+++ b/drivers/staging/comedi/drivers/adl_pci9111.c
@@ -856,7 +856,7 @@ static int pci9111_reset(struct comedi_device *dev)
        return 0;
 }
 
-static int __devinit pci9111_auto_attach(struct comedi_device *dev,
+static int pci9111_auto_attach(struct comedi_device *dev,
                                         unsigned long context_unused)
 {
        struct pci_dev *pcidev = comedi_to_pci_dev(dev);
@@ -957,7 +957,7 @@ static struct comedi_driver adl_pci9111_driver = {
        .detach         = pci9111_detach,
 };
 
-static int __devinit pci9111_pci_probe(struct pci_dev *dev,
+static int pci9111_pci_probe(struct pci_dev *dev,
                                       const struct pci_device_id *ent)
 {
        return comedi_pci_auto_config(dev, &adl_pci9111_driver);

diff --git a/drivers/staging/comedi/drivers/adl_pci9118.c b/drivers/staging/comedi/drivers/adl_pci9118.c
index c7d0f33e143a4f3e71b0f5856c08e344b44ad7d9..c35b25d2978115bb164046ef41cc5d14fa1b5abf 100644 (file)
--- a/drivers/staging/comedi/drivers/adl_pci9118.c
+++ b/drivers/staging/comedi/drivers/adl_pci9118.c
@@ -2155,7 +2155,7 @@ static int pci9118_attach(struct comedi_device *dev,
                                     softsshdelay, hw_err_mask);
 }
 
-static int __devinit pci9118_auto_attach(struct comedi_device *dev,
+static int pci9118_auto_attach(struct comedi_device *dev,
                                         unsigned long context_unused)
 {
        struct pci_dev *pcidev = comedi_to_pci_dev(dev);
@@ -2219,7 +2219,7 @@ static struct comedi_driver adl_pci9118_driver = {
        .offset         = sizeof(struct boardtype),
 };
 
-static int __devinit adl_pci9118_pci_probe(struct pci_dev *dev,
+static int adl_pci9118_pci_probe(struct pci_dev *dev,
                                           const struct pci_device_id *ent)
 {
        return comedi_pci_auto_config(dev, &adl_pci9118_driver);

diff --git a/drivers/staging/comedi/drivers/adv_pci1710.c b/drivers/staging/comedi/drivers/adv_pci1710.c
index 59c1d843a08e440a33717af84ec6f3511910b0b9..b67bb23f63c5f4d2dcf2e2a56c025bf0f7f2bbec 100644 (file)
--- a/drivers/staging/comedi/drivers/adv_pci1710.c
+++ b/drivers/staging/comedi/drivers/adv_pci1710.c
@@ -1233,7 +1233,7 @@ static const void *pci1710_find_boardinfo(struct comedi_device *dev,
        return NULL;
 }
 
-static int __devinit pci1710_auto_attach(struct comedi_device *dev,
+static int pci1710_auto_attach(struct comedi_device *dev,
                                         unsigned long context_unused)
 {
        struct pci_dev *pcidev = comedi_to_pci_dev(dev);
@@ -1396,7 +1396,7 @@ static struct comedi_driver adv_pci1710_driver = {
        .detach         = pci1710_detach,
 };
 
-static int __devinit adv_pci1710_pci_probe(struct pci_dev *dev,
+static int adv_pci1710_pci_probe(struct pci_dev *dev,
                                           const struct pci_device_id *ent)
 {
        return comedi_pci_auto_config(dev, &adv_pci1710_driver);

diff --git a/drivers/staging/comedi/drivers/adv_pci1723.c b/drivers/staging/comedi/drivers/adv_pci1723.c
index 70e017bfa06cb867ea7ff2a553626001e08ef07d..03afdd647f4d003a7033ad9faaaeddedc28717c2 100644 (file)
--- a/drivers/staging/comedi/drivers/adv_pci1723.c
+++ b/drivers/staging/comedi/drivers/adv_pci1723.c
@@ -232,7 +232,7 @@ static int pci1723_dio_insn_bits(struct comedi_device *dev,
        return insn->n;
 }
 
-static int __devinit pci1723_auto_attach(struct comedi_device *dev,
+static int pci1723_auto_attach(struct comedi_device *dev,
                                         unsigned long context_unused)
 {
        struct pci_dev *pcidev = comedi_to_pci_dev(dev);
@@ -321,7 +321,7 @@ static struct comedi_driver adv_pci1723_driver = {
        .detach         = pci1723_detach,
 };
 
-static int __devinit adv_pci1723_pci_probe(struct pci_dev *dev,
+static int adv_pci1723_pci_probe(struct pci_dev *dev,
                                           const struct pci_device_id *ent)
 {
        return comedi_pci_auto_config(dev, &adv_pci1723_driver);

diff --git a/drivers/staging/comedi/drivers/adv_pci_dio.c b/drivers/staging/comedi/drivers/adv_pci_dio.c
index 9e75006c9e741003b269d9c62761e409846632e8..2ab42c91ad26d32d9bae7bf5e44be4857afeb714 100644 (file)
--- a/drivers/staging/comedi/drivers/adv_pci_dio.c
+++ b/drivers/staging/comedi/drivers/adv_pci_dio.c
@@ -1090,7 +1090,7 @@ static const void *pci_dio_find_boardinfo(struct comedi_device *dev,
        return NULL;
 }
 
-static int __devinit pci_dio_auto_attach(struct comedi_device *dev,
+static int pci_dio_auto_attach(struct comedi_device *dev,
                                         unsigned long context_unused)
 {
        struct pci_dev *pcidev = comedi_to_pci_dev(dev);
@@ -1200,7 +1200,7 @@ static struct comedi_driver adv_pci_dio_driver = {
        .detach         = pci_dio_detach,
 };
 
-static int __devinit adv_pci_dio_pci_probe(struct pci_dev *dev,
+static int adv_pci_dio_pci_probe(struct pci_dev *dev,
                                           const struct pci_device_id *ent)
 {
        return comedi_pci_auto_config(dev, &adv_pci_dio_driver);

diff --git a/drivers/staging/comedi/drivers/amplc_dio200.c b/drivers/staging/comedi/drivers/amplc_dio200.c
index 909acf89f4ff6844a0a5fd0266f4d0d0b48713cb..4fd28e3dd80774e13f2c49708c3c900f51e81925 100644 (file)
--- a/drivers/staging/comedi/drivers/amplc_dio200.c
+++ b/drivers/staging/comedi/drivers/amplc_dio200.c
@@ -1925,7 +1925,7 @@ static int dio200_attach(struct comedi_device *dev, struct comedi_devconfig *it)
  * comedi_pci_auto_config().  dev->board_ptr is NULL on entry.
  * There should be a board entry matching the supplied PCI device.
  */
-static int __devinit dio200_auto_attach(struct comedi_device *dev,
+static int dio200_auto_attach(struct comedi_device *dev,
                                        unsigned long context_unused)
 {
        struct pci_dev *pci_dev = comedi_to_pci_dev(dev);
@@ -2072,7 +2072,7 @@ static DEFINE_PCI_DEVICE_TABLE(dio200_pci_table) = {
 
 MODULE_DEVICE_TABLE(pci, dio200_pci_table);
 
-static int __devinit amplc_dio200_pci_probe(struct pci_dev *dev,
+static int amplc_dio200_pci_probe(struct pci_dev *dev,
                                                   const struct pci_device_id
                                                   *ent)
 {

diff --git a/drivers/staging/comedi/drivers/amplc_pc236.c b/drivers/staging/comedi/drivers/amplc_pc236.c
index 09e096c6b6bdc2c0d72f5d38ebb65e8837fd98fc..156dd6f0d7e52ae55ea66b3332a2d836c6362eb0 100644 (file)
--- a/drivers/staging/comedi/drivers/amplc_pc236.c
+++ b/drivers/staging/comedi/drivers/amplc_pc236.c
@@ -526,7 +526,7 @@ static int pc236_attach(struct comedi_device *dev, struct comedi_devconfig *it)
  * comedi_pci_auto_config().  dev->board_ptr is NULL on entry.
  * There should be a board entry matching the supplied PCI device.
  */
-static int __devinit pc236_auto_attach(struct comedi_device *dev,
+static int pc236_auto_attach(struct comedi_device *dev,
                                       unsigned long context_unused)
 {
        struct pci_dev *pci_dev = comedi_to_pci_dev(dev);
@@ -608,7 +608,7 @@ static DEFINE_PCI_DEVICE_TABLE(pc236_pci_table) = {
 
 MODULE_DEVICE_TABLE(pci, pc236_pci_table);
 
-static int __devinit amplc_pc236_pci_probe(struct pci_dev *dev,
+static int amplc_pc236_pci_probe(struct pci_dev *dev,
                                           const struct pci_device_id *ent)
 {
        return comedi_pci_auto_config(dev, &amplc_pc236_driver);

diff --git a/drivers/staging/comedi/drivers/amplc_pc263.c b/drivers/staging/comedi/drivers/amplc_pc263.c
index c041716efb05c2b80d86b5badcac44903c0ce690..ec60e81f712b14e17be325ede8124bf4a184d94a 100644 (file)
--- a/drivers/staging/comedi/drivers/amplc_pc263.c
+++ b/drivers/staging/comedi/drivers/amplc_pc263.c
@@ -296,7 +296,7 @@ static int pc263_attach(struct comedi_device *dev, struct comedi_devconfig *it)
  * comedi_pci_auto_config().  dev->board_ptr is NULL on entry.
  * There should be a board entry matching the supplied PCI device.
  */
-static int __devinit pc263_auto_attach(struct comedi_device *dev,
+static int pc263_auto_attach(struct comedi_device *dev,
                                       unsigned long context_unused)
 {
        struct pci_dev *pci_dev;
@@ -365,7 +365,7 @@ static DEFINE_PCI_DEVICE_TABLE(pc263_pci_table) = {
 };
 MODULE_DEVICE_TABLE(pci, pc263_pci_table);
 
-static int __devinit amplc_pc263_pci_probe(struct pci_dev *dev,
+static int amplc_pc263_pci_probe(struct pci_dev *dev,
                                                  const struct pci_device_id
                                                  *ent)
 {

diff --git a/drivers/staging/comedi/drivers/amplc_pci224.c b/drivers/staging/comedi/drivers/amplc_pci224.c
index 1713a6660757bb8429a06a2c1294874d01f5c9f7..b1b56bab8285c435c7917bd2ca0891e40152f096 100644 (file)
--- a/drivers/staging/comedi/drivers/amplc_pci224.c
+++ b/drivers/staging/comedi/drivers/amplc_pci224.c
@@ -1438,7 +1438,7 @@ static int pci224_attach(struct comedi_device *dev, struct comedi_devconfig *it)
        return pci224_attach_common(dev, pci_dev, it->options);
 }
 
-static int __devinit
+static int
 pci224_auto_attach(struct comedi_device *dev, unsigned long context_unused)
 {
        struct pci_dev *pci_dev = comedi_to_pci_dev(dev);
@@ -1505,7 +1505,7 @@ static struct comedi_driver amplc_pci224_driver = {
        .num_names      = ARRAY_SIZE(pci224_boards),
 };
 
-static int __devinit amplc_pci224_pci_probe(struct pci_dev *dev,
+static int amplc_pci224_pci_probe(struct pci_dev *dev,
                                                   const struct pci_device_id
                                                   *ent)
 {

diff --git a/drivers/staging/comedi/drivers/amplc_pci230.c b/drivers/staging/comedi/drivers/amplc_pci230.c
index d0ea06992520058f605f102b16b9674a6ee81108..c16a45a83bb0c9b29170f04592cd1f1902b00de2 100644 (file)
--- a/drivers/staging/comedi/drivers/amplc_pci230.c
+++ b/drivers/staging/comedi/drivers/amplc_pci230.c
@@ -2801,7 +2801,7 @@ static int pci230_attach(struct comedi_device *dev, struct comedi_devconfig *it)
        return pci230_attach_common(dev, pci_dev);
 }
 
-static int __devinit pci230_auto_attach(struct comedi_device *dev,
+static int pci230_auto_attach(struct comedi_device *dev,
                                        unsigned long context_unused)
 {
        struct pci_dev *pci_dev = comedi_to_pci_dev(dev);
@@ -2857,7 +2857,7 @@ static struct comedi_driver amplc_pci230_driver = {
        .num_names      = ARRAY_SIZE(pci230_boards),
 };
 
-static int __devinit amplc_pci230_pci_probe(struct pci_dev *dev,
+static int amplc_pci230_pci_probe(struct pci_dev *dev,
                                            const struct pci_device_id *ent)
 {
        return comedi_pci_auto_config(dev, &amplc_pci230_driver);

diff --git a/drivers/staging/comedi/drivers/cb_pcidas.c b/drivers/staging/comedi/drivers/cb_pcidas.c
index 857a8d63c9fd916dd690570612591182c91c41ad..87201c4a90ee5ff9e921e438724de96201d8dd5f 100644 (file)
--- a/drivers/staging/comedi/drivers/cb_pcidas.c
+++ b/drivers/staging/comedi/drivers/cb_pcidas.c
@@ -1436,7 +1436,7 @@ static const void *cb_pcidas_find_boardinfo(struct comedi_device *dev,
        return NULL;
 }
 
-static int __devinit cb_pcidas_auto_attach(struct comedi_device *dev,
+static int cb_pcidas_auto_attach(struct comedi_device *dev,
                                           unsigned long context_unused)
 {
        struct pci_dev *pcidev = comedi_to_pci_dev(dev);
@@ -1626,7 +1626,7 @@ static struct comedi_driver cb_pcidas_driver = {
        .detach         = cb_pcidas_detach,
 };
 
-static int __devinit cb_pcidas_pci_probe(struct pci_dev *dev,
+static int cb_pcidas_pci_probe(struct pci_dev *dev,
                                         const struct pci_device_id *ent)
 {
        return comedi_pci_auto_config(dev, &cb_pcidas_driver);

diff --git a/drivers/staging/comedi/drivers/cb_pcidas64.c b/drivers/staging/comedi/drivers/cb_pcidas64.c
index ea2e1e7806660cc021acafc21fd25602d18aeda8..14019b3dbafb02dffe5fa232db2cb6c9e51d0657 100644 (file)
--- a/drivers/staging/comedi/drivers/cb_pcidas64.c
+++ b/drivers/staging/comedi/drivers/cb_pcidas64.c
@@ -4043,7 +4043,7 @@ static const struct pcidas64_board
        return NULL;
 }
 
-static int __devinit auto_attach(struct comedi_device *dev,
+static int auto_attach(struct comedi_device *dev,
                                 unsigned long context_unused)
 {
        const struct pcidas64_board *thisboard;
@@ -4214,7 +4214,7 @@ static struct comedi_driver cb_pcidas64_driver = {
        .detach         = detach,
 };
 
-static int __devinit cb_pcidas64_pci_probe(struct pci_dev *dev,
+static int cb_pcidas64_pci_probe(struct pci_dev *dev,
                                           const struct pci_device_id *ent)
 {
        return comedi_pci_auto_config(dev, &cb_pcidas64_driver);

diff --git a/drivers/staging/comedi/drivers/cb_pcidda.c b/drivers/staging/comedi/drivers/cb_pcidda.c
index f1a603b002328e5fc6c7d0e5f3cdc98a9954f434..07e98d2da1640c6559332be8bcd932a53cd07aad 100644 (file)
--- a/drivers/staging/comedi/drivers/cb_pcidda.c
+++ b/drivers/staging/comedi/drivers/cb_pcidda.c
@@ -349,7 +349,7 @@ static const void *cb_pcidda_find_boardinfo(struct comedi_device *dev,
        return NULL;
 }
 
-static int __devinit cb_pcidda_auto_attach(struct comedi_device *dev,
+static int cb_pcidda_auto_attach(struct comedi_device *dev,
                                           unsigned long context_unused)
 {
        struct pci_dev *pcidev = comedi_to_pci_dev(dev);
@@ -432,7 +432,7 @@ static struct comedi_driver cb_pcidda_driver = {
        .detach         = cb_pcidda_detach,
 };
 
-static int __devinit cb_pcidda_pci_probe(struct pci_dev *dev,
+static int cb_pcidda_pci_probe(struct pci_dev *dev,
                                         const struct pci_device_id *ent)
 {
        return comedi_pci_auto_config(dev, &cb_pcidda_driver);

diff --git a/drivers/staging/comedi/drivers/cb_pcimdas.c b/drivers/staging/comedi/drivers/cb_pcimdas.c
index f171cf9ffd1790f96a0e33efc58276ea0f54f677..01404939b4ee2e3a36e51c3cf81d0e54e1f3aa6b 100644 (file)
--- a/drivers/staging/comedi/drivers/cb_pcimdas.c
+++ b/drivers/staging/comedi/drivers/cb_pcimdas.c
@@ -205,7 +205,7 @@ static int cb_pcimdas_ao_rinsn(struct comedi_device *dev,
        return i;
 }
 
-static int __devinit cb_pcimdas_auto_attach(struct comedi_device *dev,
+static int cb_pcimdas_auto_attach(struct comedi_device *dev,
                                            unsigned long context_unused)
 {
        struct pci_dev *pcidev = comedi_to_pci_dev(dev);
@@ -293,7 +293,7 @@ static struct comedi_driver cb_pcimdas_driver = {
        .detach         = cb_pcimdas_detach,
 };
 
-static int __devinit cb_pcimdas_pci_probe(struct pci_dev *dev,
+static int cb_pcimdas_pci_probe(struct pci_dev *dev,
                                          const struct pci_device_id *ent)
 {
        return comedi_pci_auto_config(dev, &cb_pcimdas_driver);

diff --git a/drivers/staging/comedi/drivers/cb_pcimdda.c b/drivers/staging/comedi/drivers/cb_pcimdda.c
index 78e2ba3f1f24080a75ddc4ff6868be7442c7e366..12eda8e8acfda85de3715bb48ee873ec60b0a6c2 100644 (file)
--- a/drivers/staging/comedi/drivers/cb_pcimdda.c
+++ b/drivers/staging/comedi/drivers/cb_pcimdda.c
@@ -151,7 +151,7 @@ static int cb_pcimdda_ao_rinsn(struct comedi_device *dev,
        return insn->n;
 }
 
-static int __devinit cb_pcimdda_auto_attach(struct comedi_device *dev,
+static int cb_pcimdda_auto_attach(struct comedi_device *dev,
                                            unsigned long context_unused)
 {
        struct pci_dev *pcidev = comedi_to_pci_dev(dev);
@@ -216,7 +216,7 @@ static struct comedi_driver cb_pcimdda_driver = {
        .detach         = cb_pcimdda_detach,
 };
 
-static int __devinit cb_pcimdda_pci_probe(struct pci_dev *dev,
+static int cb_pcimdda_pci_probe(struct pci_dev *dev,
                                          const struct pci_device_id *ent)
 {
        return comedi_pci_auto_config(dev, &cb_pcimdda_driver);

diff --git a/drivers/staging/comedi/drivers/contec_pci_dio.c b/drivers/staging/comedi/drivers/contec_pci_dio.c
index 3c0ca852d017985a0b8979ac0d91903575574cb6..0e38f48257ba5be88d7c5ab5102822451b174069 100644 (file)
--- a/drivers/staging/comedi/drivers/contec_pci_dio.c
+++ b/drivers/staging/comedi/drivers/contec_pci_dio.c
@@ -68,7 +68,7 @@ static int contec_di_insn_bits(struct comedi_device *dev,
        return insn->n;
 }
 
-static int __devinit contec_auto_attach(struct comedi_device *dev,
+static int contec_auto_attach(struct comedi_device *dev,
                                        unsigned long context_unused)
 {
        struct pci_dev *pcidev = comedi_to_pci_dev(dev);
@@ -124,7 +124,7 @@ static struct comedi_driver contec_pci_dio_driver = {
        .detach         = contec_detach,
 };
 
-static int __devinit contec_pci_dio_pci_probe(struct pci_dev *dev,
+static int contec_pci_dio_pci_probe(struct pci_dev *dev,
                                              const struct pci_device_id *ent)
 {
        return comedi_pci_auto_config(dev, &contec_pci_dio_driver);

diff --git a/drivers/staging/comedi/drivers/daqboard2000.c b/drivers/staging/comedi/drivers/daqboard2000.c
index c0fd3b15815533d7e3b3daaf81ee3a620e35317c..fcabfbe15cb7c171a6d16ac49091a06619656c8a 100644 (file)
--- a/drivers/staging/comedi/drivers/daqboard2000.c
+++ b/drivers/staging/comedi/drivers/daqboard2000.c
@@ -688,7 +688,7 @@ static const void *daqboard2000_find_boardinfo(struct comedi_device *dev,
        return NULL;
 }
 
-static int __devinit daqboard2000_auto_attach(struct comedi_device *dev,
+static int daqboard2000_auto_attach(struct comedi_device *dev,
                                              unsigned long context_unused)
 {
        struct pci_dev *pcidev = comedi_to_pci_dev(dev);
@@ -793,7 +793,7 @@ static struct comedi_driver daqboard2000_driver = {
        .detach         = daqboard2000_detach,
 };
 
-static int __devinit daqboard2000_pci_probe(struct pci_dev *dev,
+static int daqboard2000_pci_probe(struct pci_dev *dev,
                                            const struct pci_device_id *ent)
 {
        return comedi_pci_auto_config(dev, &daqboard2000_driver);

diff --git a/drivers/staging/comedi/drivers/das08.c b/drivers/staging/comedi/drivers/das08.c
index 88f78a0efb2a0770f9f7ce8bbca8bbd4d8157579..af595bef6013c9675046f1c421a0b47e6f89f03b 100644 (file)
--- a/drivers/staging/comedi/drivers/das08.c
+++ b/drivers/staging/comedi/drivers/das08.c
@@ -774,7 +774,7 @@ das08_find_pci_board(struct pci_dev *pdev)
 }
 
 /* only called in the PCI probe path, via comedi_pci_auto_config() */
-static int __devinit __maybe_unused
+static int __maybe_unused
 das08_auto_attach(struct comedi_device *dev, unsigned long context_unused)
 {
        struct pci_dev *pdev;
@@ -885,7 +885,7 @@ static DEFINE_PCI_DEVICE_TABLE(das08_pci_table) = {
 
 MODULE_DEVICE_TABLE(pci, das08_pci_table);
 
-static int __devinit das08_pci_probe(struct pci_dev *dev,
+static int das08_pci_probe(struct pci_dev *dev,
                                            const struct pci_device_id *ent)
 {
        return comedi_pci_auto_config(dev, &das08_driver);

diff --git a/drivers/staging/comedi/drivers/dt3000.c b/drivers/staging/comedi/drivers/dt3000.c
index b61004b422a62fffe117db29a6f234865bd09de1..80d01a0c7b176eac7611bee0c5efadeae41d9915 100644 (file)
--- a/drivers/staging/comedi/drivers/dt3000.c
+++ b/drivers/staging/comedi/drivers/dt3000.c
@@ -728,7 +728,7 @@ static const void *dt3000_find_boardinfo(struct comedi_device *dev,
        return NULL;
 }
 
-static int __devinit dt3000_auto_attach(struct comedi_device *dev,
+static int dt3000_auto_attach(struct comedi_device *dev,
                                        unsigned long context_unused)
 {
        struct pci_dev *pcidev = comedi_to_pci_dev(dev);
@@ -850,7 +850,7 @@ static struct comedi_driver dt3000_driver = {
        .detach         = dt3000_detach,
 };
 
-static int __devinit dt3000_pci_probe(struct pci_dev *dev,
+static int dt3000_pci_probe(struct pci_dev *dev,
                                      const struct pci_device_id *ent)
 {
        return comedi_pci_auto_config(dev, &dt3000_driver);

diff --git a/drivers/staging/comedi/drivers/dyna_pci10xx.c b/drivers/staging/comedi/drivers/dyna_pci10xx.c
index 8736ef97f3be70ff981133c759b2453ed7e0100b..cb97319678056c459cb7822bd899274593b14462 100644 (file)
--- a/drivers/staging/comedi/drivers/dyna_pci10xx.c
+++ b/drivers/staging/comedi/drivers/dyna_pci10xx.c
@@ -177,7 +177,7 @@ static int dyna_pci10xx_do_insn_bits(struct comedi_device *dev,
        return insn->n;
 }
 
-static int __devinit dyna_pci10xx_auto_attach(struct comedi_device *dev,
+static int dyna_pci10xx_auto_attach(struct comedi_device *dev,
                                              unsigned long context_unused)
 {
        struct pci_dev *pcidev = comedi_to_pci_dev(dev);
@@ -270,7 +270,7 @@ static struct comedi_driver dyna_pci10xx_driver = {
        .detach         = dyna_pci10xx_detach,
 };
 
-static int __devinit dyna_pci10xx_pci_probe(struct pci_dev *dev,
+static int dyna_pci10xx_pci_probe(struct pci_dev *dev,
                                            const struct pci_device_id *ent)
 {
        return comedi_pci_auto_config(dev, &dyna_pci10xx_driver);

diff --git a/drivers/staging/comedi/drivers/gsc_hpdi.c b/drivers/staging/comedi/drivers/gsc_hpdi.c
index 98926469e693e0b1cb05ec35c4d6b3be23e72abf..25708bcefcfe64e8e8021a2f9bdb3ec48726390e 100644 (file)
--- a/drivers/staging/comedi/drivers/gsc_hpdi.c
+++ b/drivers/staging/comedi/drivers/gsc_hpdi.c
@@ -474,7 +474,7 @@ static const struct hpdi_board *hpdi_find_board(struct pci_dev *pcidev)
        return NULL;
 }
 
-static int __devinit hpdi_auto_attach(struct comedi_device *dev,
+static int hpdi_auto_attach(struct comedi_device *dev,
                                      unsigned long context_unused)
 {
        struct pci_dev *pcidev = comedi_to_pci_dev(dev);
@@ -940,7 +940,7 @@ static struct comedi_driver gsc_hpdi_driver = {
        .detach         = hpdi_detach,
 };
 
-static int __devinit gsc_hpdi_pci_probe(struct pci_dev *dev,
+static int gsc_hpdi_pci_probe(struct pci_dev *dev,
                                        const struct pci_device_id *ent)
 {
        return comedi_pci_auto_config(dev, &gsc_hpdi_driver);

diff --git a/drivers/staging/comedi/drivers/icp_multi.c b/drivers/staging/comedi/drivers/icp_multi.c
index ee9b40825883bcb0016b7a6d0208f0a5aab0a93c..99e77ce0429822db4f78be64c2041f8682ed50c0 100644 (file)
--- a/drivers/staging/comedi/drivers/icp_multi.c
+++ b/drivers/staging/comedi/drivers/icp_multi.c
@@ -494,7 +494,7 @@ static int icp_multi_reset(struct comedi_device *dev)
        return 0;
 }
 
-static int __devinit icp_multi_auto_attach(struct comedi_device *dev,
+static int icp_multi_auto_attach(struct comedi_device *dev,
                                           unsigned long context_unused)
 {
        struct pci_dev *pcidev = comedi_to_pci_dev(dev);
@@ -617,7 +617,7 @@ static struct comedi_driver icp_multi_driver = {
        .detach         = icp_multi_detach,
 };
 
-static int __devinit icp_multi_pci_probe(struct pci_dev *dev,
+static int icp_multi_pci_probe(struct pci_dev *dev,
                                           const struct pci_device_id *ent)
 {
        return comedi_pci_auto_config(dev, &icp_multi_driver);

diff --git a/drivers/staging/comedi/drivers/jr3_pci.c b/drivers/staging/comedi/drivers/jr3_pci.c
index ad24b7310ea106b4fb8d97ebc37facf3f59df21b..815b7ef49b071cd85342e1abffdd554c54b6dd41 100644 (file)
--- a/drivers/staging/comedi/drivers/jr3_pci.c
+++ b/drivers/staging/comedi/drivers/jr3_pci.c
@@ -657,7 +657,7 @@ static void jr3_pci_poll_dev(unsigned long data)
        add_timer(&devpriv->timer);
 }
 
-static int __devinit jr3_pci_auto_attach(struct comedi_device *dev,
+static int jr3_pci_auto_attach(struct comedi_device *dev,
                                         unsigned long context_unused)
 {
        int result;
@@ -838,7 +838,7 @@ static struct comedi_driver jr3_pci_driver = {
        .detach         = jr3_pci_detach,
 };
 
-static int __devinit jr3_pci_pci_probe(struct pci_dev *dev,
+static int jr3_pci_pci_probe(struct pci_dev *dev,
                                       const struct pci_device_id *ent)
 {
        return comedi_pci_auto_config(dev, &jr3_pci_driver);

diff --git a/drivers/staging/comedi/drivers/ke_counter.c b/drivers/staging/comedi/drivers/ke_counter.c
index 63c3a1af7e51dfad064f39910296236ca6133f14..dcce7bb826db25d6f678d3820cbcb5cfbd0f0903 100644 (file)
--- a/drivers/staging/comedi/drivers/ke_counter.c
+++ b/drivers/staging/comedi/drivers/ke_counter.c
@@ -87,7 +87,7 @@ static int cnt_rinsn(struct comedi_device *dev,
        return 1;
 }
 
-static int __devinit cnt_auto_attach(struct comedi_device *dev,
+static int cnt_auto_attach(struct comedi_device *dev,
                                     unsigned long context_unused)
 {
        struct pci_dev *pcidev = comedi_to_pci_dev(dev);
@@ -146,7 +146,7 @@ static struct comedi_driver ke_counter_driver = {
        .detach         = cnt_detach,
 };
 
-static int __devinit ke_counter_pci_probe(struct pci_dev *dev,
+static int ke_counter_pci_probe(struct pci_dev *dev,
                                          const struct pci_device_id *ent)
 {
        return comedi_pci_auto_config(dev, &ke_counter_driver);

diff --git a/drivers/staging/comedi/drivers/me4000.c b/drivers/staging/comedi/drivers/me4000.c
index 07594c579b1808c956433900e9bcf268da64a74a..f1a561551c02b3e5b73ddca6f32ad3fa9078836e 100644 (file)
--- a/drivers/staging/comedi/drivers/me4000.c
+++ b/drivers/staging/comedi/drivers/me4000.c
@@ -1563,7 +1563,7 @@ static const void *me4000_find_boardinfo(struct comedi_device *dev,
        return NULL;
 }
 
-static int __devinit me4000_auto_attach(struct comedi_device *dev,
+static int me4000_auto_attach(struct comedi_device *dev,
                                        unsigned long context_unused)
 {
        struct pci_dev *pcidev = comedi_to_pci_dev(dev);
@@ -1728,7 +1728,7 @@ static struct comedi_driver me4000_driver = {
        .detach         = me4000_detach,
 };
 
-static int __devinit me4000_pci_probe(struct pci_dev *dev,
+static int me4000_pci_probe(struct pci_dev *dev,
                                      const struct pci_device_id *ent)
 {
        return comedi_pci_auto_config(dev, &me4000_driver);

diff --git a/drivers/staging/comedi/drivers/me_daq.c b/drivers/staging/comedi/drivers/me_daq.c
index b6482dd2a8231214ec51e1c1c8c3ba00ca608fc9..8cbde12b0ecb1508a3d72e14be51738c1e8a80e9 100644 (file)
--- a/drivers/staging/comedi/drivers/me_daq.c
+++ b/drivers/staging/comedi/drivers/me_daq.c
@@ -500,7 +500,7 @@ static const void *me_find_boardinfo(struct comedi_device *dev,
        return NULL;
 }
 
-static int __devinit me_auto_attach(struct comedi_device *dev,
+static int me_auto_attach(struct comedi_device *dev,
                                    unsigned long context_unused)
 {
        struct pci_dev *pcidev = comedi_to_pci_dev(dev);
@@ -613,7 +613,7 @@ static struct comedi_driver me_daq_driver = {
        .detach         = me_detach,
 };
 
-static int __devinit me_daq_pci_probe(struct pci_dev *dev,
+static int me_daq_pci_probe(struct pci_dev *dev,
                                      const struct pci_device_id *ent)
 {
        return comedi_pci_auto_config(dev, &me_daq_driver);

diff --git a/drivers/staging/comedi/drivers/ni_6527.c b/drivers/staging/comedi/drivers/ni_6527.c
index 7ecebb75fe553716e6d414564d4d05a596f5f700..c90a5ab47051862f429afdd7525dd575409b7582 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_6527.c
+++ b/drivers/staging/comedi/drivers/ni_6527.c
@@ -341,7 +341,7 @@ ni6527_find_boardinfo(struct pci_dev *pcidev)
        return NULL;
 }
 
-static int __devinit ni6527_auto_attach(struct comedi_device *dev,
+static int ni6527_auto_attach(struct comedi_device *dev,
                                        unsigned long context_unused)
 {
        struct pci_dev *pcidev = comedi_to_pci_dev(dev);
@@ -446,7 +446,7 @@ static struct comedi_driver ni6527_driver = {
        .detach = ni6527_detach,
 };
 
-static int __devinit ni6527_pci_probe(struct pci_dev *dev,
+static int ni6527_pci_probe(struct pci_dev *dev,
                                      const struct pci_device_id *ent)
 {
        return comedi_pci_auto_config(dev, &ni6527_driver);

diff --git a/drivers/staging/comedi/drivers/ni_65xx.c b/drivers/staging/comedi/drivers/ni_65xx.c
index d2204c2cebe845f24d67ae5a835c0d85155f2555..ec733976cd3da659a02c6b8a92bc6d7d0c944d9a 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_65xx.c
+++ b/drivers/staging/comedi/drivers/ni_65xx.c
@@ -611,7 +611,7 @@ ni_65xx_find_boardinfo(struct pci_dev *pcidev)
        return NULL;
 }
 
-static int __devinit ni_65xx_auto_attach(struct comedi_device *dev,
+static int ni_65xx_auto_attach(struct comedi_device *dev,
                                         unsigned long context_unused)
 {
        struct pci_dev *pcidev = comedi_to_pci_dev(dev);
@@ -782,7 +782,7 @@ static struct comedi_driver ni_65xx_driver = {
        .detach = ni_65xx_detach,
 };
 
-static int __devinit ni_65xx_pci_probe(struct pci_dev *dev,
+static int ni_65xx_pci_probe(struct pci_dev *dev,
                                       const struct pci_device_id *ent)
 {
        return comedi_pci_auto_config(dev, &ni_65xx_driver);

diff --git a/drivers/staging/comedi/drivers/ni_660x.c b/drivers/staging/comedi/drivers/ni_660x.c
index aaf4fe771eec787075050ccd4da370a29cf2814d..58c9341fe2cf6437346e29d29ec5a1b17512163f 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_660x.c
+++ b/drivers/staging/comedi/drivers/ni_660x.c
@@ -1166,7 +1166,7 @@ static int ni_660x_dio_insn_config(struct comedi_device *dev,
        return insn->n;
 }
 
-static int __devinit ni_660x_auto_attach(struct comedi_device *dev,
+static int ni_660x_auto_attach(struct comedi_device *dev,
                                         unsigned long context_unused)
 {
        struct pci_dev *pcidev = comedi_to_pci_dev(dev);
@@ -1321,7 +1321,7 @@ static struct comedi_driver ni_660x_driver = {
        .detach         = ni_660x_detach,
 };
 
-static int __devinit ni_660x_pci_probe(struct pci_dev *dev,
+static int ni_660x_pci_probe(struct pci_dev *dev,
                                       const struct pci_device_id *ent)
 {
        return comedi_pci_auto_config(dev, &ni_660x_driver);

diff --git a/drivers/staging/comedi/drivers/ni_670x.c b/drivers/staging/comedi/drivers/ni_670x.c
index 5080eca0b9ef83175d5cd2a6ec360903274cbb5f..718f8fe172c6f50e5915391de945d93f776fd88b 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_670x.c
+++ b/drivers/staging/comedi/drivers/ni_670x.c
@@ -201,7 +201,7 @@ ni_670x_find_boardinfo(struct pci_dev *pcidev)
        return NULL;
 }
 
-static int __devinit ni_670x_auto_attach(struct comedi_device *dev,
+static int ni_670x_auto_attach(struct comedi_device *dev,
                                         unsigned long context_unused)
 {
        struct pci_dev *pcidev = comedi_to_pci_dev(dev);
@@ -303,7 +303,7 @@ static struct comedi_driver ni_670x_driver = {
        .detach         = ni_670x_detach,
 };
 
-static int __devinit ni_670x_pci_probe(struct pci_dev *dev,
+static int ni_670x_pci_probe(struct pci_dev *dev,
                                       const struct pci_device_id *ent)
 {
        return comedi_pci_auto_config(dev, &ni_670x_driver);

diff --git a/drivers/staging/comedi/drivers/ni_labpc.c b/drivers/staging/comedi/drivers/ni_labpc.c
index b2e565bf3df0a2d71a61087b1189ccc33f76a642..961642549624b2b42b72282d53181c6fba4aca49 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_labpc.c
+++ b/drivers/staging/comedi/drivers/ni_labpc.c
@@ -696,7 +696,7 @@ labpc_pci_find_boardinfo(struct pci_dev *pcidev)
        return NULL;
 }
 
-static int __devinit labpc_auto_attach(struct comedi_device *dev,
+static int labpc_auto_attach(struct comedi_device *dev,
                                       unsigned long context_unused)
 {
        struct pci_dev *pcidev = comedi_to_pci_dev(dev);
@@ -2110,7 +2110,7 @@ static DEFINE_PCI_DEVICE_TABLE(labpc_pci_table) = {
 };
 MODULE_DEVICE_TABLE(pci, labpc_pci_table);
 
-static int __devinit labpc_pci_probe(struct pci_dev *dev,
+static int labpc_pci_probe(struct pci_dev *dev,
                                     const struct pci_device_id *ent)
 {
        return comedi_pci_auto_config(dev, &labpc_driver);

diff --git a/drivers/staging/comedi/drivers/ni_pcidio.c b/drivers/staging/comedi/drivers/ni_pcidio.c
index f4dd5df0d7e1f35eaefd2a863a164140e6ecf253..c13e822604fa4c6e7ae9fbc821783d78056a9339 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_pcidio.c
+++ b/drivers/staging/comedi/drivers/ni_pcidio.c
@@ -1106,7 +1106,7 @@ nidio_find_boardinfo(struct pci_dev *pcidev)
        return NULL;
 }
 
-static int __devinit nidio_auto_attach(struct comedi_device *dev,
+static int nidio_auto_attach(struct comedi_device *dev,
                                       unsigned long context_unused)
 {
        struct pci_dev *pcidev = comedi_to_pci_dev(dev);
@@ -1218,7 +1218,7 @@ static struct comedi_driver ni_pcidio_driver = {
        .detach         = nidio_detach,
 };
 
-static int __devinit ni_pcidio_pci_probe(struct pci_dev *dev,
+static int ni_pcidio_pci_probe(struct pci_dev *dev,
                                         const struct pci_device_id *ent)
 {
        return comedi_pci_auto_config(dev, &ni_pcidio_driver);

diff --git a/drivers/staging/comedi/drivers/ni_pcimio.c b/drivers/staging/comedi/drivers/ni_pcimio.c
index 597a2d3c4a6caddadeaf801d8b45a8641aa57e33..4497860a12e90c7c6e7c3722b8db0b65639b7672 100644 (file)
--- a/drivers/staging/comedi/drivers/ni_pcimio.c
+++ b/drivers/staging/comedi/drivers/ni_pcimio.c
@@ -1620,7 +1620,7 @@ pcimio_find_boardinfo(struct pci_dev *pcidev)
        return NULL;
 }
 
-static int __devinit pcimio_auto_attach(struct comedi_device *dev,
+static int pcimio_auto_attach(struct comedi_device *dev,
                                        unsigned long context_unused)
 {
        struct pci_dev *pcidev = comedi_to_pci_dev(dev);
@@ -1785,7 +1785,7 @@ static struct comedi_driver ni_pcimio_driver = {
        .detach         = pcimio_detach,
 };
 
-static int __devinit ni_pcimio_pci_probe(struct pci_dev *dev,
+static int ni_pcimio_pci_probe(struct pci_dev *dev,
                                         const struct pci_device_id *ent)
 {
        return comedi_pci_auto_config(dev, &ni_pcimio_driver);

diff --git a/drivers/staging/comedi/drivers/rtd520.c b/drivers/staging/comedi/drivers/rtd520.c
index 83edc3e85e8271ad83caf86c6e9df076f418670d..790eafe79e5589d2efb9c88f5197676293ab5d43 100644 (file)
--- a/drivers/staging/comedi/drivers/rtd520.c
+++ b/drivers/staging/comedi/drivers/rtd520.c
@@ -1272,7 +1272,7 @@ static const void *rtd_find_boardinfo(struct comedi_device *dev,
        return NULL;
 }
 
-static int __devinit rtd_auto_attach(struct comedi_device *dev,
+static int rtd_auto_attach(struct comedi_device *dev,
                                     unsigned long context_unused)
 {
        struct pci_dev *pcidev = comedi_to_pci_dev(dev);
@@ -1414,7 +1414,7 @@ static struct comedi_driver rtd520_driver = {
        .detach         = rtd_detach,
 };
 
-static int __devinit rtd520_pci_probe(struct pci_dev *dev,
+static int rtd520_pci_probe(struct pci_dev *dev,
                                      const struct pci_device_id *ent)
 {
        return comedi_pci_auto_config(dev, &rtd520_driver);

diff --git a/drivers/staging/comedi/drivers/s626.c b/drivers/staging/comedi/drivers/s626.c
index 30686e2b8a713001627c54bee7802247ad68cc40..18f3b18a8c5bd4d8bc273840d40a247832c447d1 100644 (file)
--- a/drivers/staging/comedi/drivers/s626.c
+++ b/drivers/staging/comedi/drivers/s626.c
@@ -2657,7 +2657,7 @@ static void s626_initialize(struct comedi_device *dev)
        /* writel(IRQ_GPIO3 | IRQ_RPS1, devpriv->base_addr + P_IER); */
 }
 
-static int __devinit s626_auto_attach(struct comedi_device *dev,
+static int s626_auto_attach(struct comedi_device *dev,
                                      unsigned long context_unused)
 {
        struct pci_dev *pcidev = comedi_to_pci_dev(dev);
@@ -2830,7 +2830,7 @@ static struct comedi_driver s626_driver = {
        .detach         = s626_detach,
 };
 
-static int __devinit s626_pci_probe(struct pci_dev *dev,
+static int s626_pci_probe(struct pci_dev *dev,
                                    const struct pci_device_id *ent)
 {
        return comedi_pci_auto_config(dev, &s626_driver);

diff --git a/drivers/staging/comedi/drivers/skel.c b/drivers/staging/comedi/drivers/skel.c
index 98c1868ab03d7bd0e7b1f3f656a875718e6a39b0..bbf673f419e38fa15b26931fc7f968649c0122c0 100644 (file)
--- a/drivers/staging/comedi/drivers/skel.c
+++ b/drivers/staging/comedi/drivers/skel.c
@@ -541,16 +541,12 @@ static int skel_attach(struct comedi_device *dev, struct comedi_devconfig *it)
  * comedi_usb_auto_config(), etc.) to handle devices that can be attached
  * to the Comedi core automatically without the COMEDI_DEVCONFIG ioctl.
  *
- * For PCI devices, comedi_pci_auto_config() is usually called directly from
- * the struct pci_driver probe() function, so this _auto_attach() function
- * can be tagged __devinit.
- *
  * The context parameter is usually unused, but if the driver called
  * comedi_auto_config() directly instead of the comedi_pci_auto_config()
  * wrapper function, this will be a copy of the context passed to
  * comedi_auto_config().
  */
-static int __devinit skel_auto_attach(struct comedi_device *dev,
+static int skel_auto_attach(struct comedi_device *dev,
                                      unsigned long context)
 {
        struct pci_dev *pcidev = comedi_to_pci_dev(dev);
@@ -705,7 +701,7 @@ static DEFINE_PCI_DEVICE_TABLE(skel_pci_table) = {
 };
 MODULE_DEVICE_TABLE(pci, skel_pci_table);
 
-static int __devinit skel_pci_probe(struct pci_dev *dev,
+static int skel_pci_probe(struct pci_dev *dev,
                                           const struct pci_device_id *ent)
 {
        return comedi_pci_auto_config(dev, &skel_driver);