Merge tag 'staging-5.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[linux-2.6-microblaze.git] / drivers / iio / pressure / st_pressure_i2c.c

diff --git a/drivers/iio/pressure/st_pressure_i2c.c b/drivers/iio/pressure/st_pressure_i2c.c
index 71d2ed6..09c6903 100644 (file)
--- a/drivers/iio/pressure/st_pressure_i2c.c
+++ b/drivers/iio/pressure/st_pressure_i2c.c
@@ -10,7 +10,6 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/slab.h>
-#include <linux/acpi.h>
 #include <linux/i2c.h>
 #include <linux/iio/iio.h>
 
@@ -18,7 +17,6 @@
 #include <linux/iio/common/st_sensors_i2c.h>
 #include "st_pressure.h"
 
-#ifdef CONFIG_OF
 static const struct of_device_id st_press_of_match[] = {
        {
                .compatible = "st,lps001wp-press",
@@ -51,9 +49,6 @@ static const struct of_device_id st_press_of_match[] = {
        {},
 };
 MODULE_DEVICE_TABLE(of, st_press_of_match);
-#else
-#define st_press_of_match NULL
-#endif
 
 #ifdef CONFIG_ACPI
 static const struct acpi_device_id st_press_acpi_match[] = {
@@ -61,8 +56,6 @@ static const struct acpi_device_id st_press_acpi_match[] = {
        { },
 };
 MODULE_DEVICE_TABLE(acpi, st_press_acpi_match);
-#else
-#define st_press_acpi_match NULL
 #endif
 
 static const struct i2c_device_id st_press_id_table[] = {
@@ -85,18 +78,7 @@ static int st_press_i2c_probe(struct i2c_client *client,
        struct iio_dev *indio_dev;
        int ret;
 
-       if (client->dev.of_node) {
-               st_sensors_of_name_probe(&client->dev, st_press_of_match,
-                                        client->name, sizeof(client->name));
-       } else if (ACPI_HANDLE(&client->dev)) {
-               ret = st_sensors_match_acpi_device(&client->dev);
-               if ((ret < 0) || (ret >= ST_PRESS_MAX))
-                       return -ENODEV;
-
-               strlcpy(client->name, st_press_id_table[ret].name,
-                       sizeof(client->name));
-       } else if (!id)
-               return -ENODEV;
+       st_sensors_dev_name_probe(&client->dev, client->name, sizeof(client->name));
 
        settings = st_press_get_settings(client->name);
        if (!settings) {
@@ -133,7 +115,7 @@ static int st_press_i2c_remove(struct i2c_client *client)
 static struct i2c_driver st_press_driver = {
        .driver = {
                .name = "st-press-i2c",
-               .of_match_table = of_match_ptr(st_press_of_match),
+               .of_match_table = st_press_of_match,
                .acpi_match_table = ACPI_PTR(st_press_acpi_match),
        },
        .probe = st_press_i2c_probe,