Commit d86f90f9 authored by Alan Cox's avatar Alan Cox Committed by Greg Kroah-Hartman
Browse files

pci: Introduce pci_find_present 



This works like pci_dev_present but instead of returning boolean returns
the matching pci_device_id entry.  This makes it much more useful.  Code
bloat is basically nil as the old boolean function is rewritten in terms of
the new one.

This will be used by the updated VIA PCI quirks for one

Signed-off-by: default avatarAlan Cox <alan@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 83e42bcd

drivers/pci/search.c

+22 −17
Original line number Diff line number Diff line
@@ -413,6 +413,24 @@ exit: 
	return dev;

}



const struct pci_device_id *pci_find_present(const struct pci_device_id *ids)

{

	struct pci_dev *dev;

	struct pci_device_id * found = NULL;



	WARN_ON(in_interrupt());

	down_read(&pci_bus_sem);

	while (ids->vendor || ids->subvendor || ids->class_mask) {

		list_for_each_entry(dev, &pci_devices, global_list) {

			if ((found = pci_match_one_device(ids, dev)) != NULL)

				break;

		}

		ids++;

	}

	up_read(&pci_bus_sem);

	return found;

}



/**

 * pci_dev_present - Returns 1 if device matching the device list is present, 0 if not.

 * @ids: A pointer to a null terminated list of struct pci_device_id structures
@@ -424,27 +442,14 @@ exit: 
 * find devices that are usually built into a system, or for a general hint as

 * to if another device happens to be present at this specific moment in time.

 */



int pci_dev_present(const struct pci_device_id *ids)

{

	struct pci_dev *dev;

	int found = 0;



	WARN_ON(in_interrupt());

	down_read(&pci_bus_sem);

	while (ids->vendor || ids->subvendor || ids->class_mask) {

		list_for_each_entry(dev, &pci_devices, global_list) {

			if (pci_match_one_device(ids, dev)) {

				found = 1;

				goto exit;

			}

		}

		ids++;

	}

exit:

	up_read(&pci_bus_sem);

	return found;

	return pci_find_present(ids) == NULL ? 0 : 1;

}



EXPORT_SYMBOL(pci_dev_present);

EXPORT_SYMBOL(pci_find_present);



EXPORT_SYMBOL(pci_find_device);

EXPORT_SYMBOL(pci_find_device_reverse);

include/linux/pci.h

+2 −0
Original line number Diff line number Diff line
@@ -468,6 +468,7 @@ struct pci_dev *pci_get_slot (struct pci_bus *bus, unsigned int devfn); 
struct pci_dev *pci_get_bus_and_slot (unsigned int bus, unsigned int devfn);

struct pci_dev *pci_get_class (unsigned int class, struct pci_dev *from);

int pci_dev_present(const struct pci_device_id *ids);

const struct pci_device_id *pci_find_present(const struct pci_device_id *ids);



int pci_bus_read_config_byte (struct pci_bus *bus, unsigned int devfn, int where, u8 *val);

int pci_bus_read_config_word (struct pci_bus *bus, unsigned int devfn, int where, u16 *val);
@@ -681,6 +682,7 @@ static inline struct pci_dev *pci_get_class(unsigned int class, struct pci_dev * 
{ return NULL; }



#define pci_dev_present(ids)	(0)

#define pci_find_present(ids)	(NULL)

#define pci_dev_put(dev)	do { } while (0)



static inline void pci_set_master(struct pci_dev *dev) { }

CRA Git | Maintained and supported by SUSTech CRA and CCSE