platform/x86: int3472: Add get_sensor_adev_and_name() helper

The discrete.c code is not the only code which needs to lookup the
acpi_device and device-name for the sensor for which the INT3472
ACPI-device is a GPIO/clk/regulator provider.

The tps68470.c code also needs this functionality, so factor this
out into a new get_sensor_adev_and_name() helper.

Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Link: https://lore.kernel.org/r/20211203102857.44539-9-hdegoede@redhat.com

diff --git a/drivers/platform/x86/intel/int3472/common.c b/drivers/platform/x86/intel/int3472/common.c
index 350655a9515b1103b2e22004bc81046af33bcfa0..77cf058e4168f6894cf7e690203967cf9d426e8f 100644 (file)
--- a/drivers/platform/x86/intel/int3472/common.c
+++ b/drivers/platform/x86/intel/int3472/common.c
@@ -52,3 +52,31 @@ out_free_obj:
        kfree(obj);
        return ret;
 }
+
+/* sensor_adev_ret may be NULL, name_ret must not be NULL */
+int skl_int3472_get_sensor_adev_and_name(struct device *dev,
+                                        struct acpi_device **sensor_adev_ret,
+                                        const char **name_ret)
+{
+       struct acpi_device *adev = ACPI_COMPANION(dev);
+       struct acpi_device *sensor;
+       int ret = 0;
+
+       sensor = acpi_dev_get_first_consumer_dev(adev);
+       if (!sensor) {
+               dev_err(dev, "INT3472 seems to have no dependents.\n");
+               return -ENODEV;
+       }
+
+       *name_ret = devm_kasprintf(dev, GFP_KERNEL, I2C_DEV_NAME_FORMAT,
+                                  acpi_dev_name(sensor));
+       if (!*name_ret)
+               ret = -ENOMEM;
+
+       if (ret == 0 && sensor_adev_ret)
+               *sensor_adev_ret = sensor;
+       else
+               acpi_dev_put(sensor);
+
+       return ret;
+}

diff --git a/drivers/platform/x86/intel/int3472/common.h b/drivers/platform/x86/intel/int3472/common.h
index d14944ee85861e2eacadcd2e3895aad93ea74d82..53270d19c73abdbfd1c6df6a716bc6d14944ba67 100644 (file)
--- a/drivers/platform/x86/intel/int3472/common.h
+++ b/drivers/platform/x86/intel/int3472/common.h
@@ -108,6 +108,9 @@ struct int3472_discrete_device {
 union acpi_object *skl_int3472_get_acpi_buffer(struct acpi_device *adev,
                                               char *id);
 int skl_int3472_fill_cldb(struct acpi_device *adev, struct int3472_cldb *cldb);
+int skl_int3472_get_sensor_adev_and_name(struct device *dev,
+                                        struct acpi_device **sensor_adev_ret,
+                                        const char **name_ret);
 
 int skl_int3472_register_clock(struct int3472_discrete_device *int3472);
 void skl_int3472_unregister_clock(struct int3472_discrete_device *int3472);

diff --git a/drivers/platform/x86/intel/int3472/discrete.c b/drivers/platform/x86/intel/int3472/discrete.c
index d2e8a87a077e7e1557b11ce4aa3a463e920f5155..ff2bdbb8722cdff69fdd071673c8dab7fbccadf9 100644 (file)
--- a/drivers/platform/x86/intel/int3472/discrete.c
+++ b/drivers/platform/x86/intel/int3472/discrete.c
@@ -363,19 +363,10 @@ static int skl_int3472_discrete_probe(struct platform_device *pdev)
        int3472->dev = &pdev->dev;
        platform_set_drvdata(pdev, int3472);
 
-       int3472->sensor = acpi_dev_get_first_consumer_dev(adev);
-       if (!int3472->sensor) {
-               dev_err(&pdev->dev, "INT3472 seems to have no dependents.\n");
-               return -ENODEV;
-       }
-
-       int3472->sensor_name = devm_kasprintf(int3472->dev, GFP_KERNEL,
-                                             I2C_DEV_NAME_FORMAT,
-                                             acpi_dev_name(int3472->sensor));
-       if (!int3472->sensor_name) {
-               ret = -ENOMEM;
-               goto err_put_sensor;
-       }
+       ret = skl_int3472_get_sensor_adev_and_name(&pdev->dev, &int3472->sensor,
+                                                  &int3472->sensor_name);
+       if (ret)
+               return ret;
 
        /*
         * Initialising this list means we can call gpiod_remove_lookup_table()
@@ -390,11 +381,6 @@ static int skl_int3472_discrete_probe(struct platform_device *pdev)
        }
 
        return 0;
-
-err_put_sensor:
-       acpi_dev_put(int3472->sensor);
-
-       return ret;
 }
 
 static int skl_int3472_discrete_remove(struct platform_device *pdev)