From: Jonathan Cameron <jic23@kernel.org>
To: linux-iio@vger.kernel.org
Cc: Andy Shevchenko <andy.shevchenko@gmail.com>,
Alexandru Ardelean <aardelean@deviqon.com>,
Jonathan Cameron <Jonathan.Cameron@huawei.com>
Subject: [PATCH 1/5] iio: accel: mma9551/mma9553: Drop explicit ACPI match support
Date: Sun, 23 May 2021 17:23:11 +0100 [thread overview]
Message-ID: <20210523162315.1965869-2-jic23@kernel.org> (raw)
In-Reply-To: <20210523162315.1965869-1-jic23@kernel.org>
From: Jonathan Cameron <Jonathan.Cameron@huawei.com>
The IDs look highly suspicious as they are just the part numbers in
capitals, so lets drop these if no one screams.
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Cc: Andy Shevchenko <andy.shevchenko@gmail.com>
---
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
next prev parent reply other threads:[~2021-05-23 16:24 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-23 16:23 [PATCH 0/5] iio: accel: mma9551/mma9553 Cleanup and update Jonathan Cameron
2021-05-23 16:23 ` Jonathan Cameron [this message]
2021-05-23 19:17 ` [PATCH 1/5] iio: accel: mma9551/mma9553: Drop explicit ACPI match support Andy Shevchenko
2021-05-24 7:28 ` Alexandru Ardelean
2021-05-23 16:23 ` [PATCH 2/5] iio: accel: mma9551/mma9553: Simplify pm logic Jonathan Cameron
2021-05-24 7:33 ` Alexandru Ardelean
2021-05-23 16:23 ` [PATCH 3/5] iio: accel: mma9551: Add support to get irqs directly from fwnode Jonathan Cameron
2021-05-24 6:13 ` Andy Shevchenko
2021-05-24 9:27 ` Jonathan Cameron
2021-06-03 18:40 ` Jonathan Cameron
2021-05-24 8:16 ` Alexandru Ardelean
2021-05-23 16:23 ` [PATCH 4/5] iio: accel: mma9551: Use devm managed functions to tidy up probe() Jonathan Cameron
2021-05-24 8:13 ` Alexandru Ardelean
2021-05-23 16:23 ` [PATCH 5/5] iio: accel: mma9553: " Jonathan Cameron
2021-05-24 8:15 ` Alexandru Ardelean
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210523162315.1965869-2-jic23@kernel.org \
--to=jic23@kernel.org \
--cc=Jonathan.Cameron@huawei.com \
--cc=aardelean@deviqon.com \
--cc=andy.shevchenko@gmail.com \
--cc=linux-iio@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).