Commit 448432c4 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

PCI: remove pci_find_present 



No one is using this function anymore for quite some time, so remove it.
Everyone calls pci_dev_present() instead anyway...

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 2baad5f9

drivers/pci/search.c

+15 −20
Original line number Diff line number Diff line
@@ -436,7 +436,18 @@ struct pci_dev *pci_get_class(unsigned int class, struct pci_dev *from) 
	return dev;

}



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

/**

 * 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

 * that describe the type of PCI device the caller is trying to find.

 *

 * Obvious fact: You do not have a reference to any device that might be found

 * by this function, so if that device is removed from the system right after

 * this function is finished, the value will be stale.  Use this function to

 * 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;

	const struct pci_device_id *found = NULL;
@@ -452,27 +463,11 @@ const struct pci_device_id *pci_find_present(const struct pci_device_id *ids) 
	}

exit:

	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

 * that describe the type of PCI device the caller is trying to find.

 *

 * Obvious fact: You do not have a reference to any device that might be found

 * by this function, so if that device is removed from the system right after

 * this function is finished, the value will be stale.  Use this function to

 * 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)

{

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

	if (found)

		return 1;

	return 0;

}



EXPORT_SYMBOL(pci_dev_present);

EXPORT_SYMBOL(pci_find_present);



#ifdef CONFIG_PCI_LEGACY

EXPORT_SYMBOL(pci_find_device);

include/linux/pci.h

+0 −2
Original line number Diff line number Diff line
@@ -527,7 +527,6 @@ 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);
@@ -816,7 +815,6 @@ static inline struct pci_dev *pci_get_class(unsigned int class, 


#define pci_dev_present(ids)	(0)

#define no_pci_devices()	(1)

#define pci_find_present(ids)	(NULL)

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



static inline void pci_set_master(struct pci_dev *dev)