Merge tag 's390-5.4-2' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

[linux.git] / drivers / i2c / i2c-core-acpi.c

diff --git a/drivers/i2c/i2c-core-acpi.c b/drivers/i2c/i2c-core-acpi.c
index 4dbbc9a35f6561fb918dbd663b5bd2e4cd64eee2..9cb2aa1e20ef31a2707a5e82678cf15264b2a572 100644 (file)
--- a/drivers/i2c/i2c-core-acpi.c
+++ b/drivers/i2c/i2c-core-acpi.c
@@ -354,17 +354,13 @@ 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;
 
        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 +369,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;
 }