driver core: Provide device_match_acpi_handle() helper
Subsystems (6)
PATCH 1/3 driver core: Provide device_match_acpi_handle() helper
We have couple of users of this helper, make it available for them.
--- drivers/base/core.c | 6 ++++++ include/linux/device/bus.h | 1 + 2 files changed, 7 insertions(+)
drivers/base/core.c +6 -0
@@ -4840,6 +4840,12 @@ int device_match_acpi_dev(struct device *dev, const void *adev) }EXPORT_SYMBOL (device_match_acpi_dev); +int device_match_acpi_handle (struct device *dev,const void *handle) +{ +return ACPI_HANDLE (dev) == handle; +} +EXPORT_SYMBOL (device_match_acpi_dev); +int device_match_any (struct device *dev,const void *unused) {return 1 ;
include/linux/device/bus.h +1 -0
@@ -143,6 +143,7 @@ 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 device_match_acpi_handle (struct device *dev,const void *handle);int device_match_any (struct device *dev,const void *unused);/* iterator helpers for buses */
Signature · 1 line
2.33.0
PATCH 2/3 i2c: acpi: Replace custom function with device_match_acpi_handle()
Since driver core provides a generic device_match_acpi_handle() we may replace the custom one with it. This unifies code to find an adapter with the similar one which finds a client.
--- drivers/i2c/i2c-core-acpi.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-)
drivers/i2c/i2c-core-acpi.c +9 -13
@@ -398,24 +398,20 @@ u32 i2c_acpi_find_bus_speed(struct device *dev) }EXPORT_SYMBOL_GPL (i2c_acpi_find_bus_speed); -static int i2c_acpi_find_match_adapter (struct device *dev,const void *data) -{ -struct i2c_adapter *adapter =i2c_verify_adapter (dev); - -if (!adapter) -return 0 ; - -return ACPI_HANDLE (dev) == (acpi_handle )data; -} -struct i2c_adapter *i2c_acpi_find_adapter_by_handle (acpi_handle handle) { +struct i2c_adapter *adapter;struct device *dev; - dev =bus_find_device (&i2c_bus_type,NULL , handle, - i2c_acpi_find_match_adapter); + dev =bus_find_device (&i2c_bus_type,NULL , handle, device_match_acpi_handle); +if (!dev) +return NULL ; + + adapter =i2c_verify_adapter (dev); +if (!adapter) +put_device (dev); -return dev ?i2c_verify_adapter (dev) :NULL ; +return adapter; }EXPORT_SYMBOL_GPL (i2c_acpi_find_adapter_by_handle);
Signature · 1 line
2.33.0
PATCH 3/3 gpiolib: acpi: Replace custom code with device_match_acpi_handle()
In reply to Andy ShevchenkoSince driver core provides a generic device_match_acpi_handle() we may replace the custom code with it.
--- drivers/gpio/gpiolib-acpi.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/gpio/gpiolib-acpi.c +1 -4
@@ -95,10 +95,7 @@ static bool acpi_gpio_deferred_req_irqs_done;static int acpi_gpiochip_find (struct gpio_chip *gc,void *data) { -if (!gc->parent) -return false; - -return ACPI_HANDLE (gc->parent) == data; +return gc->parent ?device_match_acpi_handle (gc->parent, data) : false; }/**
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerQuoted 13 lines · Andy Shevchenko
We have couple of users of this helper, make it available for them.
Signed-off-by Andy Shevchenko <[email protected]>--- drivers/base/core.c | 6 ++++++ include/linux/device/bus.h | 1 + 2 files changed, 7 insertions(+)drivers/base/core.c +0
-0
drivers/base/core.c int device_match_acpi_dev(struct device *dev, const void *adev) · line 4847
Quoted 8 lines
drivers/base/core.c +5
-0@@ -4840,6 +4840,12 @@ int device_match_acpi_dev(struct device *dev, const void *adev) }EXPORT_SYMBOL (device_match_acpi_dev); +int device_match_acpi_handle (struct device *dev,const void *handle) +{ +return ACPI_HANDLE (dev) == handle; +} +EXPORT_SYMBOL (device_match_acpi_dev);
Did you build this?
:(
Quoted 17 lines · Greg Kroah-Hartman
Quoted 16 lines · Andy Shevchenko
We have couple of users of this helper, make it available for them.
Signed-off-by Andy Shevchenko <[email protected]>--- drivers/base/core.c | 6 ++++++ include/linux/device/bus.h | 1 + 2 files changed, 7 insertions(+)drivers/base/core.c +0
-0@@ -4840,6 +4840,12 @@ int device_match_acpi_dev(struct device *dev, const void *adev) }EXPORT_SYMBOL (device_match_acpi_dev);
Quoted 7 lines
drivers/base/core.c int device_match_acpi_dev(struct device *dev, const void *adev) · line 4847
Quoted 5 lines
drivers/base/core.c +5
-0+int device_match_acpi_handle (struct device *dev,const void *handle) +{ +return ACPI_HANDLE (dev) == handle; +} +EXPORT_SYMBOL (device_match_acpi_dev);Did you build this?
Yes, and it failed.
Sorry for the noise that I mistakenly sent the non-working version. In fact, I typed 'a' literally thinking the word 'abort' for git-send-email, what an irony!
Signature · 2 lines
With Best Regards, Andy Shevchenko