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

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

drivers: Introduce device lookup variants by ACPI_COMPANION device 



Add a generic helper to match a device by the ACPI_COMPANION device
and provide wrappers for the device lookup APIs.

Cc: Len Brown <lenb@kernel.org>
Cc: linux-acpi@vger.kernel.org
Cc: linux-spi@vger.kernel.org
Cc: Mika Westerberg <mika.westerberg@linux.intel.com>
Cc: linux-i2c@vger.kernel.org
Cc: "Rafael J. Wysocki" <rafael@kernel.org>
Signed-off-by: default avatarSuzuki K Poulose <suzuki.poulose@arm.com>
Acked-by: default avatarMark Brown <broonie@kernel.org>
Acked-by: Wolfram Sang <wsa@the-dreams.de> # I2C parts
Link: https://lore.kernel.org/r/20190723221838.12024-6-suzuki.poulose@arm.com


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

drivers/base/core.c

+6 −0
Original line number Diff line number Diff line
@@ -3373,3 +3373,9 @@ int device_match_devt(struct device *dev, const void *pdevt) 
	return dev->devt == *(dev_t *)pdevt;

}

EXPORT_SYMBOL_GPL(device_match_devt);



int device_match_acpi_dev(struct device *dev, const void *adev)

{

	return ACPI_COMPANION(dev) == adev;

}

EXPORT_SYMBOL(device_match_acpi_dev);

drivers/i2c/i2c-core-acpi.c

+2 −9
Original line number Diff line number Diff line
@@ -354,17 +354,11 @@ static int i2c_acpi_find_match_adapter(struct device *dev, const void *data) 
	return ACPI_HANDLE(dev) == (acpi_handle)data;

}



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

{

	return ACPI_COMPANION(dev) == data;

}



struct i2c_adapter *i2c_acpi_find_adapter_by_handle(acpi_handle handle)

{

	struct device *dev;

	struct device *dev = bus_find_device_by_acpi_dev(&i2c_bus_type, handle);



	dev = bus_find_device(&i2c_bus_type, NULL, handle,

			      i2c_acpi_find_match_adapter);

	return dev ? i2c_verify_adapter(dev) : NULL;

}

EXPORT_SYMBOL_GPL(i2c_acpi_find_adapter_by_handle);
@@ -373,8 +367,7 @@ static struct i2c_client *i2c_acpi_find_client_by_adev(struct acpi_device *adev) 
{

	struct device *dev;



	dev = bus_find_device(&i2c_bus_type, NULL, adev,

			      i2c_acpi_find_match_device);

	dev = bus_find_device_by_acpi_dev(&i2c_bus_type, adev);

	return dev ? i2c_verify_client(dev) : NULL;

}

drivers/spi/spi.c

+1 −7
Original line number Diff line number Diff line
@@ -3741,11 +3741,6 @@ static int spi_acpi_controller_match(struct device *dev, const void *data) 
	return ACPI_COMPANION(dev->parent) == data;

}



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

{

	return ACPI_COMPANION(dev) == data;

}



static struct spi_controller *acpi_spi_find_controller_by_adev(struct acpi_device *adev)

{

	struct device *dev;
@@ -3765,8 +3760,7 @@ static struct spi_device *acpi_spi_find_device_by_adev(struct acpi_device *adev) 
{

	struct device *dev;



	dev = bus_find_device(&spi_bus_type, NULL, adev, spi_acpi_device_match);



	dev = bus_find_device_by_acpi_dev(&spi_bus_type, adev);

	return dev ? to_spi_device(dev) : NULL;

}

include/linux/device.h

+65 −0
Original line number Diff line number Diff line
@@ -168,6 +168,7 @@ int device_match_name(struct device *dev, const void *name); 
int device_match_of_node(struct device *dev, const void *np);

int device_match_fwnode(struct device *dev, const void *fwnode);

int device_match_devt(struct device *dev, const void *pdevt);

int device_match_acpi_dev(struct device *dev, const void *adev);



int bus_for_each_dev(struct bus_type *bus, struct device *start, void *data,

		     int (*fn)(struct device *dev, void *data));
@@ -224,6 +225,28 @@ static inline struct device *bus_find_device_by_devt(struct bus_type *bus, 
	return bus_find_device(bus, NULL, &devt, device_match_devt);

}



#ifdef CONFIG_ACPI

struct acpi_device;



/**

 * bus_find_device_by_acpi_dev : device iterator for locating a particular device

 * matching the ACPI COMPANION device.

 * @bus: bus type

 * @adev: ACPI COMPANION device to match.

 */

static inline struct device *

bus_find_device_by_acpi_dev(struct bus_type *bus, const struct acpi_device *adev)

{

	return bus_find_device(bus, NULL, adev, device_match_acpi_dev);

}

#else

static inline struct device *

bus_find_device_by_acpi_dev(struct bus_type *bus, const void *adev)

{

	return NULL;

}

#endif



struct device *subsys_find_device_by_id(struct bus_type *bus, unsigned int id,

					struct device *hint);

int bus_for_each_drv(struct bus_type *bus, struct device_driver *start,
@@ -442,6 +465,27 @@ static inline struct device *driver_find_device_by_devt(struct device_driver *dr 
	return driver_find_device(drv, NULL, &devt, device_match_devt);

}



#ifdef CONFIG_ACPI

/**

 * driver_find_device_by_acpi_dev : device iterator for locating a particular

 * device matching the ACPI_COMPANION device.

 * @driver: the driver we're iterating

 * @adev: ACPI_COMPANION device to match.

 */

static inline struct device *

driver_find_device_by_acpi_dev(struct device_driver *drv,

			       const struct acpi_device *adev)

{

	return driver_find_device(drv, NULL, adev, device_match_acpi_dev);

}

#else

static inline struct device *

driver_find_device_by_acpi_dev(struct device_driver *drv, const void *adev)

{

	return NULL;

}

#endif



void driver_deferred_probe_add(struct device *dev);

int driver_deferred_probe_check_state(struct device *dev);

int driver_deferred_probe_check_state_continue(struct device *dev);
@@ -620,6 +664,27 @@ static inline struct device *class_find_device_by_devt(struct class *class, 
	return class_find_device(class, NULL, &devt, device_match_devt);

}



#ifdef CONFIG_ACPI

struct acpi_device;

/**

 * class_find_device_by_acpi_dev : device iterator for locating a particular

 * device matching the ACPI_COMPANION device.

 * @class: class type

 * @adev: ACPI_COMPANION device to match.

 */

static inline struct device *

class_find_device_by_acpi_dev(struct class *class, const struct acpi_device *adev)

{

	return class_find_device(class, NULL, adev, device_match_acpi_dev);

}

#else

static inline struct device *

class_find_device_by_acpi_dev(struct class *class, const void *adev)

{

	return NULL;

}

#endif



struct class_attribute {

	struct attribute attr;

	ssize_t (*show)(struct class *class, struct class_attribute *attr,