From: Jonathan Cameron <jic23@kernel.org>
To: linux-iio@vger.kernel.org
Cc: Andy Shevchenko <andy.shevchenko@gmail.com>,
Jonathan Cameron <Jonathan.Cameron@huawei.com>,
Jonathan Albrieux <jonathan.albrieux@gmail.com>
Subject: [PATCH 34/38] iio:magn:ak8975: Drop of_match_ptr and ACPI_PTR protections.
Date: Thu, 10 Sep 2020 18:32:38 +0100 [thread overview]
Message-ID: <20200910173242.621168-35-jic23@kernel.org> (raw)
In-Reply-To: <20200910173242.621168-1-jic23@kernel.org>
From: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Both would result in only a small size saving. For simplicity it
is best to remove them. I also wish to remove both these antipatterns
from IIO.
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Cc: Jonathan Albrieux <jonathan.albrieux@gmail.com>
---
drivers/iio/magnetometer/ak8975.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/drivers/iio/magnetometer/ak8975.c b/drivers/iio/magnetometer/ak8975.c
index 03d71f796177..0141ef3b6476 100644
--- a/drivers/iio/magnetometer/ak8975.c
+++ b/drivers/iio/magnetometer/ak8975.c
@@ -8,6 +8,7 @@
*/
#include <linux/module.h>
+#include <linux/mod_devicetable.h>
#include <linux/kernel.h>
#include <linux/slab.h>
#include <linux/i2c.h>
@@ -17,7 +18,6 @@
#include <linux/delay.h>
#include <linux/bitops.h>
#include <linux/gpio/consumer.h>
-#include <linux/acpi.h>
#include <linux/regulator/consumer.h>
#include <linux/pm_runtime.h>
@@ -773,7 +773,6 @@ static const struct iio_info ak8975_info = {
.read_raw = &ak8975_read_raw,
};
-#ifdef CONFIG_ACPI
static const struct acpi_device_id ak_acpi_match[] = {
{"AK8975", AK8975},
{"AK8963", AK8963},
@@ -785,7 +784,6 @@ static const struct acpi_device_id ak_acpi_match[] = {
{ }
};
MODULE_DEVICE_TABLE(acpi, ak_acpi_match);
-#endif
static void ak8975_fill_buffer(struct iio_dev *indio_dev)
{
@@ -1075,8 +1073,8 @@ static struct i2c_driver ak8975_driver = {
.driver = {
.name = "ak8975",
.pm = &ak8975_dev_pm_ops,
- .of_match_table = of_match_ptr(ak8975_of_match),
- .acpi_match_table = ACPI_PTR(ak_acpi_match),
+ .of_match_table = ak8975_of_match,
+ .acpi_match_table = ak_acpi_match,
},
.probe = ak8975_probe,
.remove = ak8975_remove,
--
2.28.0
next prev parent reply other threads:[~2020-09-10 17:39 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-10 17:32 [PATCH 00/38] iio: remaining easy of_match_ptr removal and related Jonathan Cameron
2020-09-10 17:32 ` [PATCH 01/38] iio:potentiometer:ad5272: Drop of_match_ptr and CONFIG_OF protections Jonathan Cameron
2020-09-10 17:32 ` [PATCH 02/38] iio:potentiometer:ds1803: " Jonathan Cameron
2020-09-10 17:32 ` [PATCH 03/38] iio:potentiometer:max5432: Drop of_match_ptr and use generic fw accessors Jonathan Cameron
2020-09-21 14:24 ` Martin Kaiser
2020-09-10 17:32 ` [PATCH 04/38] iio:potentiometer:max5481: Drop of_match_ptr and CONFIG_OF protections Jonathan Cameron
2020-09-10 17:32 ` [PATCH 05/38] iio:potentiometer:max5481: Drop invalid ACPI binding Jonathan Cameron
2020-09-14 8:07 ` Andy Shevchenko
2020-09-10 17:32 ` [PATCH 06/38] iio:potentiometer:mcp4018: Drop of_match_ptr and CONFIG_OF protections Jonathan Cameron
2020-09-10 17:32 ` [PATCH 07/38] iio:potentiometer:mcp4131: Drop of_match_ptr and use generic fw interfaces Jonathan Cameron
2020-09-10 17:32 ` [PATCH 08/38] iio:potentiometer:mcp4531: Drop of_match_ptr and CONFIG_OF protections Jonathan Cameron
2020-09-10 17:32 ` [PATCH 09/38] iio:dac:ad5446: " Jonathan Cameron
2020-09-10 17:32 ` [PATCH 10/38] iio:dac:ad5592r: Drop of_match_ptr and ACPI_PTR protections Jonathan Cameron
2020-09-10 17:32 ` [PATCH 11/38] iio:dac:ad5593r: " Jonathan Cameron
2020-09-10 17:32 ` [PATCH 12/38] iio:dac:ad7303: Drop of_match_ptr protection Jonathan Cameron
2020-09-10 17:32 ` [PATCH 13/38] iio:dac:mcp4725: drop of_match_ptr and use generic fw properties Jonathan Cameron
2020-09-10 17:32 ` [PATCH 14/38] iio:dac:ti-dac082s085: Drop of_match_ptr and CONFIG_OF protections Jonathan Cameron
2020-09-10 17:32 ` [PATCH 15/38] iio:dac:ti-dac5571: " Jonathan Cameron
2020-09-10 17:32 ` [PATCH 16/38] iio:potentiostat:lmp91000: Drop of_match_ptr and use generic fw accessors Jonathan Cameron
2020-09-15 18:59 ` Matt Ranostay
2020-09-10 17:32 ` [PATCH 17/38] iio:pressure:icp10100: Drop of_match_ptr and CONFIG_OF protections Jonathan Cameron
2020-09-10 17:32 ` [PATCH 18/38] iio:pressure:ms5611: " Jonathan Cameron
2020-09-10 17:32 ` [PATCH 19/38] iio:pressure:ms5637: Drop of_match_ptr protection Jonathan Cameron
2020-09-10 17:32 ` [PATCH 20/38] iio:pressure:zpa2326: " Jonathan Cameron
2020-09-10 17:32 ` [PATCH 21/38] iio:temperature:tsys01: " Jonathan Cameron
2020-09-10 17:32 ` [PATCH 22/38] iio:temperature:tmp007: " Jonathan Cameron
2020-09-10 17:32 ` [PATCH 23/38] iio:resolver:ad2s1200: " Jonathan Cameron
2020-09-10 17:32 ` [PATCH 24/38] iio:chemical:ams-iaq-core: " Jonathan Cameron
2020-09-15 18:55 ` Matt Ranostay
2020-09-10 17:32 ` [PATCH 25/38] iio:chemical:atlas-sensor: Drop of_match_ptr and use generic fw accessors Jonathan Cameron
2020-09-15 18:59 ` Matt Ranostay
2020-09-10 17:32 ` [PATCH 26/38] iio:chemical:sgp30: Use local variable dev to simplify code Jonathan Cameron
2020-09-10 17:32 ` [PATCH 27/38] iio:chemical:sgp30: Drop of_match_ptr and use generic fw accessors Jonathan Cameron
2020-09-10 17:32 ` [PATCH 28/38] iio:chemical:vz89x: Introduce local struct device pointer Jonathan Cameron
2020-09-15 19:02 ` Matt Ranostay
2020-09-10 17:32 ` [PATCH 29/38] iio:chemical:vz89x: Drop of_match_ptr protection and use generic fw accessors Jonathan Cameron
2020-09-15 19:03 ` Matt Ranostay
2020-09-10 17:32 ` [PATCH 30/38] iio:humidity:hdc100x: Drop of_match_ptr protection Jonathan Cameron
2020-09-15 18:59 ` Matt Ranostay
2020-09-10 17:32 ` [PATCH 31/38] iio:proximity:as3935: Use local struct device pointer to simplify code Jonathan Cameron
2020-09-15 18:56 ` Matt Ranostay
2020-09-10 17:32 ` [PATCH 32/38] iio:proximity:as3935: Drop of_match_ptr and use generic fw accessors Jonathan Cameron
2020-09-15 18:55 ` Matt Ranostay
2020-09-10 17:32 ` [PATCH 33/38] iio:proximity:pulsedlight: Drop of_match_ptr protection Jonathan Cameron
2020-09-15 18:55 ` Matt Ranostay
2020-09-10 17:32 ` Jonathan Cameron [this message]
2020-09-11 18:59 ` [PATCH 34/38] iio:magn:ak8975: Drop of_match_ptr and ACPI_PTR protections Jonathan Albrieux
2020-09-10 17:32 ` [PATCH 35/38] iio:magn:ak8974: Drop of_match_ptr protection Jonathan Cameron
2020-09-29 12:40 ` Linus Walleij
2020-09-10 17:32 ` [PATCH 36/38] iio:humidity:htu21: " Jonathan Cameron
2020-09-10 17:32 ` [PATCH 37/38] iio:humidity:si7020: " Jonathan Cameron
2020-09-10 17:32 ` [PATCH 38/38] iio:health:max30102: Drop of_match_ptr and use generic fw accessors Jonathan Cameron
2020-09-15 18:54 ` Matt Ranostay
2020-09-14 8:04 ` [PATCH 00/38] iio: remaining easy of_match_ptr removal and related Andy Shevchenko
2020-09-17 18:17 ` Jonathan Cameron
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=20200910173242.621168-35-jic23@kernel.org \
--to=jic23@kernel.org \
--cc=Jonathan.Cameron@huawei.com \
--cc=andy.shevchenko@gmail.com \
--cc=jonathan.albrieux@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).