Commit 20fb2280 authored by Kulikov Vasiliy's avatar Kulikov Vasiliy Committed by Greg Kroah-Hartman
Browse files

Staging: comedi: use for_each_pci_dev() 



Use for_each_pci_dev() to simplify the code.

Signed-off-by: default avatarKulikov Vasiliy <segooon@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 27bf0bc9

drivers/staging/comedi/drivers/addi-data/addi_amcc_s5933.h

+2 −4
Original line number Diff line number Diff line
@@ -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) {

drivers/staging/comedi/drivers/adl_pci6208.c

+2 −4
Original line number Diff line number Diff line
@@ -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 ==

drivers/staging/comedi/drivers/adl_pci7230.c

+2 −5
Original line number Diff line number Diff line
@@ -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) {

drivers/staging/comedi/drivers/adl_pci7296.c

+2 −5
Original line number Diff line number Diff line
@@ -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) {

drivers/staging/comedi/drivers/adl_pci7432.c

+2 −5
Original line number Diff line number Diff line
@@ -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) {