On Sun, 23 May 2021 at 19:24, Jonathan Cameron <jic23@xxxxxxxxxx> wrote:
>
> From: Jonathan Cameron <Jonathan.Cameron@xxxxxxxxxx>
>
> The IDs look highly suspicious as they are just the part numbers in
> capitals, so lets drop these if no one screams.
>
I think some headers (at least acpi.h) could be removed with this patch.
Other than that:
Reviewed-by: Alexandru Ardelean <aardelean@xxxxxxxxxxx>
> Signed-off-by: Jonathan Cameron <Jonathan.Cameron@xxxxxxxxxx>
> Cc: Andy Shevchenko <andy.shevchenko@xxxxxxxxx>
> ---
> drivers/iio/accel/mma9551.c | 21 ---------------------
> drivers/iio/accel/mma9553.c | 21 ---------------------
> 2 files changed, 42 deletions(-)
>
> diff --git a/drivers/iio/accel/mma9551.c b/drivers/iio/accel/mma9551.c
> index 4c359fb05480..2b74f67536a3 100644
> --- a/drivers/iio/accel/mma9551.c
> +++ b/drivers/iio/accel/mma9551.c
> @@ -435,17 +435,6 @@ static int mma9551_gpio_probe(struct iio_dev *indio_dev)
> return 0;
> }
>
> -static const char *mma9551_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);
> -}
> -
> static int mma9551_probe(struct i2c_client *client,
> const struct i2c_device_id *id)
> {
> @@ -464,8 +453,6 @@ static int mma9551_probe(struct i2c_client *client,
>
> if (id)
> name = id->name;
> - else if (ACPI_HANDLE(&client->dev))
> - name = mma9551_match_acpi_device(&client->dev);
>
> ret = mma9551_init(data);
> if (ret < 0)
> @@ -591,13 +578,6 @@ static const struct dev_pm_ops mma9551_pm_ops = {
> mma9551_runtime_resume, NULL)
> };
>
> -static const struct acpi_device_id mma9551_acpi_match[] = {
> - {"MMA9551", 0},
> - {},
> -};
> -
> -MODULE_DEVICE_TABLE(acpi, mma9551_acpi_match);
> -
> static const struct i2c_device_id mma9551_id[] = {
> {"mma9551", 0},
> {}
> @@ -608,7 +588,6 @@ MODULE_DEVICE_TABLE(i2c, mma9551_id);
> static struct i2c_driver mma9551_driver = {
> .driver = {
> .name = MMA9551_DRV_NAME,
> - .acpi_match_table = ACPI_PTR(mma9551_acpi_match),
> .pm = &mma9551_pm_ops,
> },
> .probe = mma9551_probe,
> diff --git a/drivers/iio/accel/mma9553.c b/drivers/iio/accel/mma9553.c
> index ba3ecb3b57dc..32c9a79ebfec 100644
> --- a/drivers/iio/accel/mma9553.c
> +++ b/drivers/iio/accel/mma9553.c
> @@ -1062,17 +1062,6 @@ static irqreturn_t mma9553_event_handler(int irq, void *private)
> return IRQ_HANDLED;
> }
>
> -static const char *mma9553_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);
> -}
> -
> static int mma9553_probe(struct i2c_client *client,
> const struct i2c_device_id *id)
> {
> @@ -1091,8 +1080,6 @@ static int mma9553_probe(struct i2c_client *client,
>
> if (id)
> name = id->name;
> - else if (ACPI_HANDLE(&client->dev))
> - name = mma9553_match_acpi_device(&client->dev);
> else
> return -ENOSYS;
>
> @@ -1230,13 +1217,6 @@ static const struct dev_pm_ops mma9553_pm_ops = {
> mma9553_runtime_resume, NULL)
> };
>
> -static const struct acpi_device_id mma9553_acpi_match[] = {
> - {"MMA9553", 0},
> - {},
> -};
> -
> -MODULE_DEVICE_TABLE(acpi, mma9553_acpi_match);
> -
> static const struct i2c_device_id mma9553_id[] = {
> {"mma9553", 0},
> {},
> @@ -1247,7 +1227,6 @@ MODULE_DEVICE_TABLE(i2c, mma9553_id);
> static struct i2c_driver mma9553_driver = {
> .driver = {
> .name = MMA9553_DRV_NAME,
> - .acpi_match_table = ACPI_PTR(mma9553_acpi_match),
> .pm = &mma9553_pm_ops,
> },
> .probe = mma9553_probe,
> --
> 2.31.1
>
