Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6bf85ba9 authored by Suzuki K Poulose's avatar Suzuki K Poulose Committed by Greg Kroah-Hartman
Browse files

drivers: Add generic helper to match any device 



Add a generic helper to match any/all devices. Using this
introduce new wrappers {bus/driver/class}_find_next_device().

Cc: Elie Morisse <syniurge@gmail.com>
Cc: "James E.J. Bottomley" <jejb@linux.ibm.com>
Cc: "Martin K. Petersen" <martin.petersen@oracle.com>
Cc: Nehal Shah <nehal-bakulchandra.shah@amd.com>
Cc: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
Cc: Shyam Sundar S K <shyam-sundar.s-k@amd.com>
Signed-off-by: default avatarSuzuki K Poulose <suzuki.poulose@arm.com>
Acked-by: Bjorn Helgaas <bhelgaas@google.com> # PCI
Link: https://lore.kernel.org/r/20190723221838.12024-7-suzuki.poulose@arm.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 00500147

drivers/base/core.c

+6 −0
Original line number Diff line number Diff line
@@ -3379,3 +3379,9 @@ int device_match_acpi_dev(struct device *dev, const void *adev) 
	return ACPI_COMPANION(dev) == adev;

}

EXPORT_SYMBOL(device_match_acpi_dev);



int device_match_any(struct device *dev, const void *unused)

{

	return 1;

}

EXPORT_SYMBOL_GPL(device_match_any);

drivers/i2c/busses/i2c-amd-mp2-pci.c

+1 −7
Original line number Diff line number Diff line
@@ -457,18 +457,12 @@ static struct pci_driver amd_mp2_pci_driver = { 
};

module_pci_driver(amd_mp2_pci_driver);



static int amd_mp2_device_match(struct device *dev, const void *data)

{

	return 1;

}



struct amd_mp2_dev *amd_mp2_find_device(void)

{

	struct device *dev;

	struct pci_dev *pci_dev;



	dev = driver_find_device(&amd_mp2_pci_driver.driver, NULL, NULL,

				 amd_mp2_device_match);

	dev = driver_find_next_device(&amd_mp2_pci_driver.driver, NULL);

	if (!dev)

		return NULL;

drivers/pci/probe.c

+1 −6
Original line number Diff line number Diff line
@@ -64,11 +64,6 @@ static struct resource *get_pci_domain_busn_res(int domain_nr) 
	return &r->res;

}



static int find_anything(struct device *dev, const void *data)

{

	return 1;

}



/*

 * Some device drivers need know if PCI is initiated.

 * Basically, we think PCI is not initiated when there
@@ -79,7 +74,7 @@ int no_pci_devices(void) 
	struct device *dev;

	int no_devices;



	dev = bus_find_device(&pci_bus_type, NULL, NULL, find_anything);

	dev = bus_find_next_device(&pci_bus_type, NULL);

	no_devices = (dev == NULL);

	put_device(dev);

	return no_devices;

drivers/s390/cio/ccwgroup.c

+1 −7
Original line number Diff line number Diff line
@@ -581,11 +581,6 @@ int ccwgroup_driver_register(struct ccwgroup_driver *cdriver) 
}

EXPORT_SYMBOL(ccwgroup_driver_register);



static int __ccwgroup_match_all(struct device *dev, const void *data)

{

	return 1;

}



/**

 * ccwgroup_driver_unregister() - deregister a ccw group driver

 * @cdriver: driver to be deregistered
@@ -597,8 +592,7 @@ void ccwgroup_driver_unregister(struct ccwgroup_driver *cdriver) 
	struct device *dev;



	/* We don't want ccwgroup devices to live longer than their driver. */

	while ((dev = driver_find_device(&cdriver->driver, NULL, NULL,

					 __ccwgroup_match_all))) {

	while ((dev = driver_find_next_device(&cdriver->driver, NULL))) {

		struct ccwgroup_device *gdev = to_ccwgroupdev(dev);



		ccwgroup_ungroup(gdev);

drivers/scsi/scsi_proc.c

+2 −7
Original line number Diff line number Diff line
@@ -372,15 +372,10 @@ static ssize_t proc_scsi_write(struct file *file, const char __user *buf, 
	return err;

}



static int always_match(struct device *dev, const void *data)

{

	return 1;

}



static inline struct device *next_scsi_device(struct device *start)

{

	struct device *next = bus_find_device(&scsi_bus_type, start, NULL,

					      always_match);

	struct device *next = bus_find_next_device(&scsi_bus_type, start);



	put_device(start);

	return next;

}