mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-02-21 19:58:34 -05:00
iio: gyro: bmg160: Replace custom implementation of iio_get_acpi_device_name()
IIO core (ACPI part) provides a generic helper that may be used in the driver. Replace custom implementation of iio_get_acpi_device_name(). Reviewed-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Link: https://patch.msgid.link/20241024191200.229894-20-andriy.shevchenko@linux.intel.com Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
This commit is contained in:
committed by
Jonathan Cameron
parent
e85e016e9d
commit
99f2add1b4
@@ -8,7 +8,6 @@
|
||||
#include <linux/interrupt.h>
|
||||
#include <linux/delay.h>
|
||||
#include <linux/slab.h>
|
||||
#include <linux/acpi.h>
|
||||
#include <linux/pm.h>
|
||||
#include <linux/pm_runtime.h>
|
||||
#include <linux/iio/iio.h>
|
||||
@@ -1055,17 +1054,6 @@ static const struct iio_buffer_setup_ops bmg160_buffer_setup_ops = {
|
||||
.postdisable = bmg160_buffer_postdisable,
|
||||
};
|
||||
|
||||
static const char *bmg160_match_acpi_device(struct device *dev)
|
||||
{
|
||||
const struct acpi_device_id *id;
|
||||
|
||||
id = acpi_match_device(dev->driver->acpi_match_table, dev);
|
||||
if (!id)
|
||||
return NULL;
|
||||
|
||||
return dev_name(dev);
|
||||
}
|
||||
|
||||
int bmg160_core_probe(struct device *dev, struct regmap *regmap, int irq,
|
||||
const char *name)
|
||||
{
|
||||
@@ -1098,9 +1086,6 @@ int bmg160_core_probe(struct device *dev, struct regmap *regmap, int irq,
|
||||
|
||||
mutex_init(&data->mutex);
|
||||
|
||||
if (ACPI_HANDLE(dev))
|
||||
name = bmg160_match_acpi_device(dev);
|
||||
|
||||
indio_dev->channels = bmg160_channels;
|
||||
indio_dev->num_channels = ARRAY_SIZE(bmg160_channels);
|
||||
indio_dev->name = name;
|
||||
|
||||
@@ -17,7 +17,7 @@ static int bmg160_i2c_probe(struct i2c_client *client)
|
||||
{
|
||||
const struct i2c_device_id *id = i2c_client_get_device_id(client);
|
||||
struct regmap *regmap;
|
||||
const char *name = NULL;
|
||||
const char *name;
|
||||
|
||||
regmap = devm_regmap_init_i2c(client, &bmg160_regmap_i2c_conf);
|
||||
if (IS_ERR(regmap)) {
|
||||
@@ -28,6 +28,8 @@ static int bmg160_i2c_probe(struct i2c_client *client)
|
||||
|
||||
if (id)
|
||||
name = id->name;
|
||||
else
|
||||
name = iio_get_acpi_device_name(&client->dev);
|
||||
|
||||
return bmg160_core_probe(&client->dev, regmap, client->irq, name);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user