mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-22 00:40:03 +00:00
iio:pressure:ms5611: Drop of_match_ptr and CONFIG_OF protections
These prevents use of this driver with ACPI via PRP0001 and are an example of an anti pattern I'm trying to remove from IIO. Hence drop them from this driver. Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com> Cc: Tomasz Duszynski <tduszyns@gmail.com> Link: https://lore.kernel.org/r/20200910173242.621168-19-jic23@kernel.org
This commit is contained in:
parent
eb25d0aa4a
commit
0e62470652
2 changed files with 4 additions and 8 deletions
|
@ -14,7 +14,7 @@
|
|||
#include <linux/delay.h>
|
||||
#include <linux/i2c.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/of_device.h>
|
||||
#include <linux/mod_devicetable.h>
|
||||
|
||||
#include <asm/unaligned.h>
|
||||
|
||||
|
@ -113,14 +113,12 @@ static int ms5611_i2c_remove(struct i2c_client *client)
|
|||
return ms5611_remove(i2c_get_clientdata(client));
|
||||
}
|
||||
|
||||
#if defined(CONFIG_OF)
|
||||
static const struct of_device_id ms5611_i2c_matches[] = {
|
||||
{ .compatible = "meas,ms5611" },
|
||||
{ .compatible = "meas,ms5607" },
|
||||
{ }
|
||||
};
|
||||
MODULE_DEVICE_TABLE(of, ms5611_i2c_matches);
|
||||
#endif
|
||||
|
||||
static const struct i2c_device_id ms5611_id[] = {
|
||||
{ "ms5611", MS5611 },
|
||||
|
@ -132,7 +130,7 @@ MODULE_DEVICE_TABLE(i2c, ms5611_id);
|
|||
static struct i2c_driver ms5611_driver = {
|
||||
.driver = {
|
||||
.name = "ms5611",
|
||||
.of_match_table = of_match_ptr(ms5611_i2c_matches)
|
||||
.of_match_table = ms5611_i2c_matches,
|
||||
},
|
||||
.id_table = ms5611_id,
|
||||
.probe = ms5611_i2c_probe,
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
#include <linux/delay.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/spi/spi.h>
|
||||
#include <linux/of_device.h>
|
||||
#include <linux/mod_devicetable.h>
|
||||
|
||||
#include <asm/unaligned.h>
|
||||
|
||||
|
@ -115,14 +115,12 @@ static int ms5611_spi_remove(struct spi_device *spi)
|
|||
return ms5611_remove(spi_get_drvdata(spi));
|
||||
}
|
||||
|
||||
#if defined(CONFIG_OF)
|
||||
static const struct of_device_id ms5611_spi_matches[] = {
|
||||
{ .compatible = "meas,ms5611" },
|
||||
{ .compatible = "meas,ms5607" },
|
||||
{ }
|
||||
};
|
||||
MODULE_DEVICE_TABLE(of, ms5611_spi_matches);
|
||||
#endif
|
||||
|
||||
static const struct spi_device_id ms5611_id[] = {
|
||||
{ "ms5611", MS5611 },
|
||||
|
@ -134,7 +132,7 @@ MODULE_DEVICE_TABLE(spi, ms5611_id);
|
|||
static struct spi_driver ms5611_driver = {
|
||||
.driver = {
|
||||
.name = "ms5611",
|
||||
.of_match_table = of_match_ptr(ms5611_spi_matches)
|
||||
.of_match_table = ms5611_spi_matches
|
||||
},
|
||||
.id_table = ms5611_id,
|
||||
.probe = ms5611_spi_probe,
|
||||
|
|
Loading…
Reference in a new issue