| Message ID | 20180816184915.32138-1-tduszyns@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | iio: pressure: ms5611: remove deprecated compatible strings | expand |
On Thu, 16 Aug 2018 20:49:15 +0200 Tomasz Duszynski <tduszyns@gmail.com> 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 <tduszyns@gmail.com> 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);
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);
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 <tduszyns@gmail.com> --- drivers/iio/pressure/ms5611_i2c.c | 2 -- drivers/iio/pressure/ms5611_spi.c | 2 -- 2 files changed, 4 deletions(-)