2018-08-16 18:53:48

by Tomasz Duszynski

Subject: [PATCH] iio: pressure: ms5611: remove deprecated compatible strings

Compatible strings tend to follow manufacturer,model format.
In case one wants to do a matching with manufacturer stripped
off he can still do so since SPI/I2C core will try id_table
based matching anyway.

Signed-off-by: Tomasz Duszynski <[email protected]>
---
drivers/iio/pressure/ms5611_i2c.c | 2 --
drivers/iio/pressure/ms5611_spi.c | 2 --
2 files changed, 4 deletions(-)

diff --git a/drivers/iio/pressure/ms5611_i2c.c b/drivers/iio/pressure/ms5611_i2c.c
index 55fb5fc0b6ea..0469c8ae1134 100644
--- a/drivers/iio/pressure/ms5611_i2c.c
+++ b/drivers/iio/pressure/ms5611_i2c.c
@@ -117,9 +117,7 @@ static int ms5611_i2c_remove(struct i2c_client *client)
#if defined(CONFIG_OF)
static const struct of_device_id ms5611_i2c_matches[] = {
{ .compatible = "meas,ms5611" },
- { .compatible = "ms5611" },
{ .compatible = "meas,ms5607" },
- { .compatible = "ms5607" },
{ }
};
MODULE_DEVICE_TABLE(of, ms5611_i2c_matches);
diff --git a/drivers/iio/pressure/ms5611_spi.c b/drivers/iio/pressure/ms5611_spi.c
index 932e05001e1a..cd11d022208e 100644
--- a/drivers/iio/pressure/ms5611_spi.c
+++ b/drivers/iio/pressure/ms5611_spi.c
@@ -119,9 +119,7 @@ static int ms5611_spi_remove(struct spi_device *spi)
#if defined(CONFIG_OF)
static const struct of_device_id ms5611_spi_matches[] = {
{ .compatible = "meas,ms5611" },
- { .compatible = "ms5611" },
{ .compatible = "meas,ms5607" },
- { .compatible = "ms5607" },
{ }
};
MODULE_DEVICE_TABLE(of, ms5611_spi_matches);
--
2.18.0

2018-08-19 16:19:31

by Jonathan Cameron

Subject: Re: [PATCH] iio: pressure: ms5611: remove deprecated compatible strings

On Thu, 16 Aug 2018 20:49:15 +0200
Tomasz Duszynski <[email protected]> wrote:

> Compatible strings tend to follow manufacturer,model format.
> In case one wants to do a matching with manufacturer stripped
> off he can still do so since SPI/I2C core will try id_table
> based matching anyway.
>
> Signed-off-by: Tomasz Duszynski <[email protected]>
Applied to the togreg branch of iio.git and pushed out as testing
for the autobuilders to play with it.

Thanks,

Jonathan

> ---
> drivers/iio/pressure/ms5611_i2c.c | 2 --
> drivers/iio/pressure/ms5611_spi.c | 2 --
> 2 files changed, 4 deletions(-)
>
> diff --git a/drivers/iio/pressure/ms5611_i2c.c b/drivers/iio/pressure/ms5611_i2c.c
> index 55fb5fc0b6ea..0469c8ae1134 100644
> --- a/drivers/iio/pressure/ms5611_i2c.c
> +++ b/drivers/iio/pressure/ms5611_i2c.c
> @@ -117,9 +117,7 @@ static int ms5611_i2c_remove(struct i2c_client *client)
> #if defined(CONFIG_OF)
> static const struct of_device_id ms5611_i2c_matches[] = {
> { .compatible = "meas,ms5611" },
> - { .compatible = "ms5611" },
> { .compatible = "meas,ms5607" },
> - { .compatible = "ms5607" },
> { }
> };
> MODULE_DEVICE_TABLE(of, ms5611_i2c_matches);
> diff --git a/drivers/iio/pressure/ms5611_spi.c b/drivers/iio/pressure/ms5611_spi.c
> index 932e05001e1a..cd11d022208e 100644
> --- a/drivers/iio/pressure/ms5611_spi.c
> +++ b/drivers/iio/pressure/ms5611_spi.c
> @@ -119,9 +119,7 @@ static int ms5611_spi_remove(struct spi_device *spi)
> #if defined(CONFIG_OF)
> static const struct of_device_id ms5611_spi_matches[] = {
> { .compatible = "meas,ms5611" },
> - { .compatible = "ms5611" },
> { .compatible = "meas,ms5607" },
> - { .compatible = "ms5607" },
> { }
> };
> MODULE_DEVICE_TABLE(of, ms5611_spi_matches);