Staging: comedi: use for_each_pci_dev()

Use for_each_pci_dev() to simplify the code.

Signed-off-by: Kulikov Vasiliy <segooon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/comedi/drivers/addi-data/addi_amcc_s5933.h b/drivers/staging/comedi/drivers/addi-data/addi_amcc_s5933.h
index c3284eb0f0ac4447dcc53b8234263df27021a133..8ed19bcbf35252173ff3093b61038c3881713929 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/addi_amcc_s5933.h
+++ b/drivers/staging/comedi/drivers/addi-data/addi_amcc_s5933.h
@@ -247,16 +247,14 @@ int i_pci_card_data(struct pcilst_struct *amcc,
 /* build list of amcc cards in this system */
 void v_pci_card_list_init(unsigned short pci_vendor, char display)
 {
-       struct pci_dev *pcidev;
+       struct pci_dev *pcidev = NULL;
        struct pcilst_struct *amcc, *last;
        int i;
        int i_Count = 0;
        amcc_devices = NULL;
        last = NULL;
 
-       for (pcidev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, NULL);
-            pcidev != NULL;
-            pcidev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, pcidev)) {
+       for_each_pci_dev(pcidev) {
                for (i_Count = 0; i_Count < 2; i_Count++) {
                        pci_vendor = i_ADDIDATADeviceID[i_Count];
                        if (pcidev->vendor == pci_vendor) {

diff --git a/drivers/staging/comedi/drivers/adl_pci6208.c b/drivers/staging/comedi/drivers/adl_pci6208.c
index 0bc6ac2b6424e62eb73b4e2e475f231b18622188..073d0242c28e72835b2a62659bf6fa7f2382795b 100644 (file)
--- a/drivers/staging/comedi/drivers/adl_pci6208.c
+++ b/drivers/staging/comedi/drivers/adl_pci6208.c
@@ -351,12 +351,10 @@ static int pci6208_ao_rinsn(struct comedi_device *dev,
 
 static int pci6208_find_device(struct comedi_device *dev, int bus, int slot)
 {
-       struct pci_dev *pci_dev;
+       struct pci_dev *pci_dev = NULL;
        int i;
 
-       for (pci_dev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, NULL);
-            pci_dev != NULL;
-            pci_dev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, pci_dev)) {
+       for_each_pci_dev(pci_dev) {
                if (pci_dev->vendor == PCI_VENDOR_ID_ADLINK) {
                        for (i = 0; i < ARRAY_SIZE(pci6208_boards); i++) {
                                if (pci6208_boards[i].dev_id ==

diff --git a/drivers/staging/comedi/drivers/adl_pci7230.c b/drivers/staging/comedi/drivers/adl_pci7230.c
index caeb4e11ac59855b4c1fdeb5880eee8a48036ffb..72a7258b5b9279c8eef9eed8f8d0e64aed742bc5 100644 (file)
--- a/drivers/staging/comedi/drivers/adl_pci7230.c
+++ b/drivers/staging/comedi/drivers/adl_pci7230.c
@@ -90,7 +90,7 @@ static int adl_pci7230_do_insn_bits(struct comedi_device *dev,
 static int adl_pci7230_attach(struct comedi_device *dev,
        struct comedi_devconfig *it)
 {
-       struct pci_dev *pcidev;
+       struct pci_dev *pcidev = NULL;
        struct comedi_subdevice *s;
        int bus, slot;
 
@@ -106,10 +106,7 @@ static int adl_pci7230_attach(struct comedi_device *dev,
        if (alloc_subdevices(dev, 2) < 0)
                return -ENOMEM;
 
-       for (pcidev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, NULL);
-               pcidev != NULL;
-               pcidev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, pcidev)) {
-
+       for_each_pci_dev(pcidev) {
                if (pcidev->vendor == PCI_VENDOR_ID_ADLINK &&
                        pcidev->device == PCI_DEVICE_ID_PCI7230) {
                        if (bus || slot) {

diff --git a/drivers/staging/comedi/drivers/adl_pci7296.c b/drivers/staging/comedi/drivers/adl_pci7296.c
index 947fae5adb94e28f25a6b04c7ea788dfae494c0c..f28fe6bec050948985143f1d1a1720687cd27d20 100644 (file)
--- a/drivers/staging/comedi/drivers/adl_pci7296.c
+++ b/drivers/staging/comedi/drivers/adl_pci7296.c
@@ -77,7 +77,7 @@ static struct comedi_driver driver_adl_pci7296 = {
 static int adl_pci7296_attach(struct comedi_device *dev,
                              struct comedi_devconfig *it)
 {
-       struct pci_dev *pcidev;
+       struct pci_dev *pcidev = NULL;
        struct comedi_subdevice *s;
        int bus, slot;
        int ret;
@@ -94,10 +94,7 @@ static int adl_pci7296_attach(struct comedi_device *dev,
        if (alloc_subdevices(dev, 4) < 0)
                return -ENOMEM;
 
-       for (pcidev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, NULL);
-            pcidev != NULL;
-            pcidev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, pcidev)) {
-
+       for_each_pci_dev(pcidev) {
                if (pcidev->vendor == PCI_VENDOR_ID_ADLINK &&
                    pcidev->device == PCI_DEVICE_ID_PCI7296) {
                        if (bus || slot) {

diff --git a/drivers/staging/comedi/drivers/adl_pci7432.c b/drivers/staging/comedi/drivers/adl_pci7432.c
index 3b2f8e3fccd2583acadae0f0f6197232971c5496..262da7b29b281bb86a44480b53a3fb0927cc5749 100644 (file)
--- a/drivers/staging/comedi/drivers/adl_pci7432.c
+++ b/drivers/staging/comedi/drivers/adl_pci7432.c
@@ -86,7 +86,7 @@ static int adl_pci7432_do_insn_bits(struct comedi_device *dev,
 static int adl_pci7432_attach(struct comedi_device *dev,
                              struct comedi_devconfig *it)
 {
-       struct pci_dev *pcidev;
+       struct pci_dev *pcidev = NULL;
        struct comedi_subdevice *s;
        int bus, slot;
 
@@ -102,10 +102,7 @@ static int adl_pci7432_attach(struct comedi_device *dev,
        if (alloc_subdevices(dev, 2) < 0)
                return -ENOMEM;
 
-       for (pcidev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, NULL);
-            pcidev != NULL;
-            pcidev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, pcidev)) {
-
+       for_each_pci_dev(pcidev) {
                if (pcidev->vendor == PCI_VENDOR_ID_ADLINK &&
                    pcidev->device == PCI_DEVICE_ID_PCI7432) {
                        if (bus || slot) {

diff --git a/drivers/staging/comedi/drivers/adl_pci8164.c b/drivers/staging/comedi/drivers/adl_pci8164.c
index 1b7155e4895ee3f22cce02903bc8feb42cb64f6e..767a594935c713d512940e2ac2eaf6437ceb06d7 100644 (file)
--- a/drivers/staging/comedi/drivers/adl_pci8164.c
+++ b/drivers/staging/comedi/drivers/adl_pci8164.c
@@ -125,7 +125,7 @@ static int adl_pci8164_insn_write_buf1(struct comedi_device *dev,
 static int adl_pci8164_attach(struct comedi_device *dev,
                              struct comedi_devconfig *it)
 {
-       struct pci_dev *pcidev;
+       struct pci_dev *pcidev = NULL;
        struct comedi_subdevice *s;
        int bus, slot;
 
@@ -142,10 +142,7 @@ static int adl_pci8164_attach(struct comedi_device *dev,
        if (alloc_subdevices(dev, 4) < 0)
                return -ENOMEM;
 
-       for (pcidev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, NULL);
-            pcidev != NULL;
-            pcidev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, pcidev)) {
-
+       for_each_pci_dev(pcidev) {
                if (pcidev->vendor == PCI_VENDOR_ID_ADLINK &&
                    pcidev->device == PCI_DEVICE_ID_PCI8164) {
                        if (bus || slot) {

diff --git a/drivers/staging/comedi/drivers/adl_pci9111.c b/drivers/staging/comedi/drivers/adl_pci9111.c
index 38a5752bc4fc49b7862d2f3aa8fc12fa137cf9f7..43b84534b78f35ac4757ed4d444b3b50bb1fd369 100644 (file)
--- a/drivers/staging/comedi/drivers/adl_pci9111.c
+++ b/drivers/staging/comedi/drivers/adl_pci9111.c
@@ -1262,7 +1262,7 @@ static int pci9111_attach(struct comedi_device *dev,
 {
        struct comedi_subdevice *subdevice;
        unsigned long io_base, io_range, lcr_io_base, lcr_io_range;
-       struct pci_dev *pci_device;
+       struct pci_dev *pci_device = NULL;
        int error, i;
        const struct pci9111_board *board;
 
@@ -1272,9 +1272,7 @@ static int pci9111_attach(struct comedi_device *dev,
 
        printk("comedi%d: " PCI9111_DRIVER_NAME " driver\n", dev->minor);
 
-       for (pci_device = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, NULL);
-            pci_device != NULL;
-            pci_device = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, pci_device)) {
+       for_each_pci_dev(pci_device) {
                if (pci_device->vendor == PCI_VENDOR_ID_ADLINK) {
                        for (i = 0; i < pci9111_board_nbr; i++) {
                                if (pci9111_boards[i].device_id ==

diff --git a/drivers/staging/comedi/drivers/adv_pci_dio.c b/drivers/staging/comedi/drivers/adv_pci_dio.c
index 31a63887ab0de4ead290167d39045088db49d6b0..d018bb4e2890619000196343748585c25c755744 100644 (file)
--- a/drivers/staging/comedi/drivers/adv_pci_dio.c
+++ b/drivers/staging/comedi/drivers/adv_pci_dio.c
@@ -1104,7 +1104,7 @@ static int pci_dio_attach(struct comedi_device *dev,
        struct comedi_subdevice *s;
        int ret, subdev, n_subdevices, i, j;
        unsigned long iobase;
-       struct pci_dev *pcidev;
+       struct pci_dev *pcidev = NULL;
 
        printk("comedi%d: adv_pci_dio: ", dev->minor);
 
@@ -1114,9 +1114,7 @@ static int pci_dio_attach(struct comedi_device *dev,
                return -ENOMEM;
        }
 
-       for (pcidev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, NULL);
-            pcidev != NULL;
-            pcidev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, pcidev)) {
+       for_each_pci_dev(pcidev) {
                /*  loop through cards supported by this driver */
                for (i = 0; i < n_boardtypes; ++i) {
                        if (boardtypes[i].vendor_id != pcidev->vendor)

diff --git a/drivers/staging/comedi/drivers/amplc_pci230.c b/drivers/staging/comedi/drivers/amplc_pci230.c
index b572df718f21d1acca3b9f9b1ca818df412ef3e7..5d064577b2f1872eedad442cd9a5f5e82281f58d 100644 (file)
--- a/drivers/staging/comedi/drivers/amplc_pci230.c
+++ b/drivers/staging/comedi/drivers/amplc_pci230.c
@@ -764,7 +764,7 @@ static int pci230_attach(struct comedi_device *dev, struct comedi_devconfig *it)
        struct comedi_subdevice *s;
        unsigned long iobase1, iobase2;
        /* PCI230's I/O spaces 1 and 2 respectively. */
-       struct pci_dev *pci_dev;
+       struct pci_dev *pci_dev = NULL;
        int i = 0, irq_hdl, rc;
 
        printk("comedi%d: amplc_pci230: attach %s %d,%d\n", dev->minor,
@@ -780,9 +780,7 @@ static int pci230_attach(struct comedi_device *dev, struct comedi_devconfig *it)
        spin_lock_init(&devpriv->ai_stop_spinlock);
        spin_lock_init(&devpriv->ao_stop_spinlock);
        /* Find card */
-       for (pci_dev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, NULL);
-            pci_dev != NULL;
-            pci_dev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, pci_dev)) {
+       for_each_pci_dev(pci_dev) {
                if (it->options[0] || it->options[1]) {
                        /* Match against bus/slot options. */
                        if (it->options[0] != pci_dev->bus->number ||

diff --git a/drivers/staging/comedi/drivers/cb_pcidas.c b/drivers/staging/comedi/drivers/cb_pcidas.c
index 2d9ad537793e04c464816defb3a39fbfa3faaef3..6530b6c9d98b98b0fdd14210ba90637c5b9cfb15 100644 (file)
--- a/drivers/staging/comedi/drivers/cb_pcidas.c
+++ b/drivers/staging/comedi/drivers/cb_pcidas.c
@@ -533,7 +533,7 @@ static int cb_pcidas_attach(struct comedi_device *dev,
                            struct comedi_devconfig *it)
 {
        struct comedi_subdevice *s;
-       struct pci_dev *pcidev;
+       struct pci_dev *pcidev = NULL;
        int index;
        int i;
 
@@ -550,9 +550,7 @@ static int cb_pcidas_attach(struct comedi_device *dev,
  */
        printk("\n");
 
-       for (pcidev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, NULL);
-            pcidev != NULL;
-            pcidev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, pcidev)) {
+       for_each_pci_dev(pcidev) {
                /*  is it not a computer boards card? */
                if (pcidev->vendor != PCI_VENDOR_ID_CB)
                        continue;

diff --git a/drivers/staging/comedi/drivers/cb_pcidas64.c b/drivers/staging/comedi/drivers/cb_pcidas64.c
index ba7c48ab6d92af631939c7af91b34f01d52ef8d8..53e7015869fc1332d355214fe2663ab80618169b 100644 (file)
--- a/drivers/staging/comedi/drivers/cb_pcidas64.c
+++ b/drivers/staging/comedi/drivers/cb_pcidas64.c
@@ -1754,7 +1754,7 @@ static inline void warn_external_queue(struct comedi_device *dev)
  */
 static int attach(struct comedi_device *dev, struct comedi_devconfig *it)
 {
-       struct pci_dev *pcidev;
+       struct pci_dev *pcidev = NULL;
        int index;
        uint32_t local_range, local_decode;
        int retval;
@@ -1771,9 +1771,7 @@ static int attach(struct comedi_device *dev, struct comedi_devconfig *it)
  * Probe the device to determine what device in the series it is.
  */
 
-       for (pcidev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, NULL);
-            pcidev != NULL;
-            pcidev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, pcidev)) {
+       for_each_pci_dev(pcidev) {
                /*  is it not a computer boards card? */
                if (pcidev->vendor != PCI_VENDOR_ID_COMPUTERBOARDS)
                        continue;

diff --git a/drivers/staging/comedi/drivers/cb_pcidda.c b/drivers/staging/comedi/drivers/cb_pcidda.c
index 349c7a61763a456d700bceefb1a91584c973896d..2f2997fd926fd26f5b96e5fdbbb52d273bb9e98d 100644 (file)
--- a/drivers/staging/comedi/drivers/cb_pcidda.c
+++ b/drivers/staging/comedi/drivers/cb_pcidda.c
@@ -281,7 +281,7 @@ static int cb_pcidda_attach(struct comedi_device *dev,
                            struct comedi_devconfig *it)
 {
        struct comedi_subdevice *s;
-       struct pci_dev *pcidev;
+       struct pci_dev *pcidev = NULL;
        int index;
 
        printk("comedi%d: cb_pcidda: ", dev->minor);
@@ -297,9 +297,7 @@ static int cb_pcidda_attach(struct comedi_device *dev,
  */
        printk("\n");
 
-       for (pcidev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, NULL);
-            pcidev != NULL;
-            pcidev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, pcidev)) {
+       for_each_pci_dev(pcidev) {
                if (pcidev->vendor == PCI_VENDOR_ID_CB) {
                        if (it->options[0] || it->options[1]) {
                                if (pcidev->bus->number != it->options[0] ||

diff --git a/drivers/staging/comedi/drivers/cb_pcidio.c b/drivers/staging/comedi/drivers/cb_pcidio.c
index a9d902f418a17c1ce7368986a23f4921e32b8d0b..c1693c91a6d08d84f4558a236d4f14d36a499a02 100644 (file)
--- a/drivers/staging/comedi/drivers/cb_pcidio.c
+++ b/drivers/staging/comedi/drivers/cb_pcidio.c
@@ -202,9 +202,7 @@ static int pcidio_attach(struct comedi_device *dev, struct comedi_devconfig *it)
  * Probe the device to determine what device in the series it is.
  */
 
-       for (pcidev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, NULL);
-            pcidev != NULL;
-            pcidev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, pcidev)) {
+       for_each_pci_dev(pcidev) {
                /*  is it not a computer boards card? */
                if (pcidev->vendor != PCI_VENDOR_ID_CB)
                        continue;

diff --git a/drivers/staging/comedi/drivers/cb_pcimdas.c b/drivers/staging/comedi/drivers/cb_pcimdas.c
index e50b8c259e2cdfa155f8eb5a66d9a5a8b9653962..ced346a7cae36550bc93311e7cf4e62142233078 100644 (file)
--- a/drivers/staging/comedi/drivers/cb_pcimdas.c
+++ b/drivers/staging/comedi/drivers/cb_pcimdas.c
@@ -210,7 +210,7 @@ static int cb_pcimdas_attach(struct comedi_device *dev,
                             struct comedi_devconfig *it)
 {
        struct comedi_subdevice *s;
-       struct pci_dev *pcidev;
+       struct pci_dev *pcidev = NULL;
        int index;
        /* int i; */
 
@@ -227,9 +227,7 @@ static int cb_pcimdas_attach(struct comedi_device *dev,
  */
        printk("\n");
 
-       for (pcidev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, NULL);
-            pcidev != NULL;
-            pcidev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, pcidev)) {
+       for_each_pci_dev(pcidev) {
                /*  is it not a computer boards card? */
                if (pcidev->vendor != PCI_VENDOR_ID_COMPUTERBOARDS)
                        continue;

diff --git a/drivers/staging/comedi/drivers/cb_pcimdda.c b/drivers/staging/comedi/drivers/cb_pcimdda.c
index 3160330b1d9eecf5b8875b632507a205a7df4397..8c981a89ab63cad9f459c0937c8a9e65ec4d8a2f 100644 (file)
--- a/drivers/staging/comedi/drivers/cb_pcimdda.c
+++ b/drivers/staging/comedi/drivers/cb_pcimdda.c
@@ -464,13 +464,11 @@ static int ao_rinsn(struct comedi_device *dev, struct comedi_subdevice *s,
  */
 static int probe(struct comedi_device *dev, const struct comedi_devconfig *it)
 {
-       struct pci_dev *pcidev;
+       struct pci_dev *pcidev = NULL;
        int index;
        unsigned long registers;
 
-       for (pcidev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, NULL);
-            pcidev != NULL;
-            pcidev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, pcidev)) {
+       for_each_pci_dev(pcidev) {
                /*  is it not a computer boards card? */
                if (pcidev->vendor != PCI_VENDOR_ID_COMPUTERBOARDS)
                        continue;

diff --git a/drivers/staging/comedi/drivers/contec_pci_dio.c b/drivers/staging/comedi/drivers/contec_pci_dio.c
index 24ac10ce0bae8df184eda15443e98e29ba7ed828..871f109bcfa31093e12a555b432eb0064647935c 100644 (file)
--- a/drivers/staging/comedi/drivers/contec_pci_dio.c
+++ b/drivers/staging/comedi/drivers/contec_pci_dio.c
@@ -103,7 +103,7 @@ static int contec_ns_to_timer(unsigned int *ns, int round);
 
 static int contec_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 {
-       struct pci_dev *pcidev;
+       struct pci_dev *pcidev = NULL;
        struct comedi_subdevice *s;
 
        printk("comedi%d: contec: ", dev->minor);
@@ -116,10 +116,7 @@ static int contec_attach(struct comedi_device *dev, struct comedi_devconfig *it)
        if (alloc_subdevices(dev, 2) < 0)
                return -ENOMEM;
 
-       for (pcidev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, NULL);
-            pcidev != NULL;
-            pcidev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, pcidev)) {
-
+       for_each_pci_dev(pcidev) {
                if (pcidev->vendor == PCI_VENDOR_ID_CONTEC &&
                    pcidev->device == PCI_DEVICE_ID_PIO1616L) {
                        if (it->options[0] || it->options[1]) {

diff --git a/drivers/staging/comedi/drivers/das08.c b/drivers/staging/comedi/drivers/das08.c
index ad18572a122443f35ac6933950b3a3621e305ee4..3141dc80fe743d4ec5e916581d4a74f471447b34 100644 (file)
--- a/drivers/staging/comedi/drivers/das08.c
+++ b/drivers/staging/comedi/drivers/das08.c
@@ -980,7 +980,7 @@ static int das08_attach(struct comedi_device *dev, struct comedi_devconfig *it)
        unsigned long iobase;
 #ifdef CONFIG_COMEDI_PCI
        unsigned long pci_iobase = 0;
-       struct pci_dev *pdev;
+       struct pci_dev *pdev = NULL;
 #endif
 
        ret = alloc_private(dev, sizeof(struct das08_private_struct));
@@ -997,9 +997,7 @@ static int das08_attach(struct comedi_device *dev, struct comedi_devconfig *it)
                }
                printk("\n");
                /*  find card */
-               for (pdev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, NULL);
-                    pdev != NULL;
-                    pdev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, pdev)) {
+               for_each_pci_dev(pdev) {
                        if (pdev->vendor == PCI_VENDOR_ID_COMPUTERBOARDS
                            && pdev->device == PCI_DEVICE_ID_PCIDAS08) {
                                if (it->options[0] || it->options[1]) {

diff --git a/drivers/staging/comedi/drivers/icp_multi.h b/drivers/staging/comedi/drivers/icp_multi.h
index 2bb96b1d21e78c650d9a82519190ca87cc203e02..68acefe16888bef038ef8f5df2c2ba43256d2557 100644 (file)
--- a/drivers/staging/comedi/drivers/icp_multi.h
+++ b/drivers/staging/comedi/drivers/icp_multi.h
@@ -62,16 +62,14 @@ static int pci_card_data(struct pcilst_struct *amcc,
 /* build list of Inova cards in this system */
 static void pci_card_list_init(unsigned short pci_vendor, char display)
 {
-       struct pci_dev *pcidev;
+       struct pci_dev *pcidev = NULL;
        struct pcilst_struct *inova, *last;
        int i;
 
        inova_devices = NULL;
        last = NULL;
 
-       for (pcidev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, NULL);
-            pcidev != NULL;
-            pcidev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, pcidev)) {
+       for_each_pci_dev(pcidev) {
                if (pcidev->vendor == pci_vendor) {
                        inova = kzalloc(sizeof(*inova), GFP_KERNEL);
                        if (!inova) {

diff --git a/drivers/staging/comedi/drivers/ke_counter.c b/drivers/staging/comedi/drivers/ke_counter.c
index e30aa012369271d0e5c4260374f07e8a1270be66..286093bca3fba6eed4f0c3b2ef775270785090f0 100644 (file)
--- a/drivers/staging/comedi/drivers/ke_counter.c
+++ b/drivers/staging/comedi/drivers/ke_counter.c
@@ -188,7 +188,7 @@ static int cnt_rinsn(struct comedi_device *dev,
 static int cnt_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 {
        struct comedi_subdevice *subdevice;
-       struct pci_dev *pci_device;
+       struct pci_dev *pci_device = NULL;
        struct cnt_board_struct *board;
        unsigned long io_base;
        int error, i;
@@ -199,9 +199,7 @@ static int cnt_attach(struct comedi_device *dev, struct comedi_devconfig *it)
                return error;
 
        /* Probe the device to determine what device in the series it is. */
-       for (pci_device = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, NULL);
-            pci_device != NULL;
-            pci_device = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, pci_device)) {
+       for_each_pci_dev(pci_device) {
                if (pci_device->vendor == PCI_VENDOR_ID_KOLTER) {
                        for (i = 0; i < cnt_board_nbr; i++) {
                                if (cnt_boards[i].device_id ==

diff --git a/drivers/staging/comedi/drivers/me4000.c b/drivers/staging/comedi/drivers/me4000.c
index 56c9279c700ead44463cfd1bdab7bfb5c0bf757e..14713849564d9f29db923f65bf83309089842d8a 100644 (file)
--- a/drivers/staging/comedi/drivers/me4000.c
+++ b/drivers/staging/comedi/drivers/me4000.c
@@ -389,7 +389,7 @@ static int me4000_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 
 static int me4000_probe(struct comedi_device *dev, struct comedi_devconfig *it)
 {
-       struct pci_dev *pci_device;
+       struct pci_dev *pci_device = NULL;
        int result, i;
        struct me4000_board *board;
 
@@ -402,9 +402,7 @@ static int me4000_probe(struct comedi_device *dev, struct comedi_devconfig *it)
        /*
         * Probe the device to determine what device in the series it is.
         */
-       for (pci_device = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, NULL);
-            pci_device != NULL;
-            pci_device = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, pci_device)) {
+       for_each_pci_dev(pci_device) {
                if (pci_device->vendor == PCI_VENDOR_ID_MEILHAUS) {
                        for (i = 0; i < ME4000_BOARD_VERSIONS; i++) {
                                if (me4000_boards[i].device_id ==

diff --git a/drivers/staging/comedi/drivers/me_daq.c b/drivers/staging/comedi/drivers/me_daq.c
index 579e6a5718002acca75e4058f692899995158541..cda4b224b30fb933571d46fd66b528a437718165 100644 (file)
--- a/drivers/staging/comedi/drivers/me_daq.c
+++ b/drivers/staging/comedi/drivers/me_daq.c
@@ -680,7 +680,7 @@ static int me_reset(struct comedi_device *dev)
  */
 static int me_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 {
-       struct pci_dev *pci_device;
+       struct pci_dev *pci_device = NULL;
        struct comedi_subdevice *subdevice;
        struct me_board *board;
        resource_size_t plx_regbase_tmp;
@@ -697,9 +697,7 @@ static int me_attach(struct comedi_device *dev, struct comedi_devconfig *it)
                return -ENOMEM;
 
        /* Probe the device to determine what device in the series it is. */
-       for (pci_device = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, NULL);
-            pci_device != NULL;
-            pci_device = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, pci_device)) {
+       for_each_pci_dev(pci_device) {
                if (pci_device->vendor == PCI_VENDOR_ID_MEILHAUS) {
                        for (i = 0; i < me_board_nbr; i++) {
                                if (me_boards[i].device_id ==

diff --git a/drivers/staging/comedi/drivers/mite.c b/drivers/staging/comedi/drivers/mite.c
index 4b7d207ab14dd8d186676ec1df89ebc103074ed9..cd25b241cc1f4e131925abcce8ec40dd067e8fa9 100644 (file)
--- a/drivers/staging/comedi/drivers/mite.c
+++ b/drivers/staging/comedi/drivers/mite.c
@@ -70,12 +70,10 @@ EXPORT_SYMBOL(mite_devices);
 
 void mite_init(void)
 {
-       struct pci_dev *pcidev;
+       struct pci_dev *pcidev = NULL;
        struct mite_struct *mite;
 
-       for (pcidev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, NULL);
-            pcidev != NULL;
-            pcidev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, pcidev)) {
+       for_each_pci_dev(pcidev) {
                if (pcidev->vendor == PCI_VENDOR_ID_NI) {
                        unsigned i;