Skip to contentSkip to conversation

driver core: Provide device_match_acpi_handle() helper

PATCH Superseded Andy Shevchenko 3 participants 5 messages Oct 6, 2021

Subsystems (6)

v1 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

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
index c4a2c97a21a2..18f1f6499246 100644
@@ -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
index 062777a45a74..a039ab809753 100644
@@ -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
#1 lore raw

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
index 7ea2ac712a57..0aea776cd4c9 100644
@@ -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
#2 lore raw

PATCH 3/3 gpiolib: acpi: Replace custom code with device_match_acpi_handle()

In reply to Andy Shevchenko

Since 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
index 47712b6903b5..32f1f720b94b 100644
@@ -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
#3 lore raw
In reply to Andy Shevchenko
Quoted 13 lines · Andy Shevchenko

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 +0 -0
index c4a2c97a21a2..18f1f6499246 100644

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?

:(

#4 lore raw
Quoted 17 lines · Greg Kroah-Hartman
Quoted 16 lines · Andy Shevchenko

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 +0 -0
index c4a2c97a21a2..18f1f6499246 100644
@@ -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