iio: light: bh1780: use mod_devicetable.h and drop of_match_ptr macro (f73a0474) · Commits · 戴 / test

Whilst this enables ACPI binding or the device via PRP0001 the primary aim is to remove potential for these two things to be cut and paste into new drivers. Signed-off-by:

Jonathan Cameron <Jonathan.Cameron@huawei.com> Reviewed-by:

Alexandru Ardelean <alexandru.ardelean@analog.com>

drivers/iio/light/bh1780.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -13,7 +13,7 @@
		#include <linux/platform_device.h>
		#include <linux/delay.h>
		#include <linux/module.h>
		#include <linux/of.h>
		#include <linux/mod_devicetable.h>
		#include <linux/pm_runtime.h>
		#include <linux/iio/iio.h>
		#include <linux/iio/sysfs.h>
		@@ -273,13 +273,11 @@ static const struct i2c_device_id bh1780_id[] = {

		MODULE_DEVICE_TABLE(i2c, bh1780_id);

		#ifdef CONFIG_OF
		static const struct of_device_id of_bh1780_match[] = {
		{ .compatible = "rohm,bh1780gli", },
		{},
		};
		MODULE_DEVICE_TABLE(of, of_bh1780_match);
		#endif

		static struct i2c_driver bh1780_driver = {
		.probe = bh1780_probe,
		@@ -288,7 +286,7 @@ static struct i2c_driver bh1780_driver = {
		.driver = {
		.name = "bh1780",
		.pm = &bh1780_dev_pm_ops,
		.of_match_table = of_match_ptr(of_bh1780_match),
		.of_match_table = of_bh1780_match,
		},
		};

Admin message