iio: accel: bma220: Drop ACPI_PTR() and accompanying ifdeffery (846afc1d) · Commits · 戴 / test

The driver is quite likely used only on ACPI based platforms and rarely build with CONFIG_ACPI=n. Even though, the few dozens of bytes is better than ugly ifdeffery and inclusion of heavy header. As a result, replace acpi.h with mod_devicetable.h. Signed-off-by:

Andy Shevchenko <andriy.shevchenko@linux.intel.com> Link: https://lore.kernel.org/r/20200831090813.78841-5-andriy.shevchenko@linux.intel.com Signed-off-by:

Jonathan Cameron <Jonathan.Cameron@huawei.com>

drivers/iio/accel/bma220_spi.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -5,8 +5,8 @@
		* Copyright (c) 2016, Intel Corporation.
		*/

		#include <linux/acpi.h>
		#include <linux/kernel.h>
		#include <linux/mod_devicetable.h>
		#include <linux/module.h>
		#include <linux/iio/buffer.h>
		#include <linux/iio/iio.h>
		@@ -308,20 +308,18 @@ static const struct spi_device_id bma220_spi_id[] = {
		{}
		};

		#ifdef CONFIG_ACPI
		static const struct acpi_device_id bma220_acpi_id[] = {
		{"BMA0220", 0},
		{}
		};

		MODULE_DEVICE_TABLE(spi, bma220_spi_id);
		#endif

		static struct spi_driver bma220_driver = {
		.driver = {
		.name = "bma220_spi",
		.pm = &bma220_pm_ops,
		.acpi_match_table = ACPI_PTR(bma220_acpi_id),
		.acpi_match_table = bma220_acpi_id,
		},
		.probe = bma220_probe,
		.remove = bma220_remove,

Admin message