On 17/02/16 17:52, Gregor Boirie wrote:
> From: Grégor Boirie <gregor.boirie@xxxxxxxxxx>
>
> Use name of probed device instead of driver's one when registering device.
>
> Signed-off-by: Gregor Boirie <gregor.boirie@xxxxxxxxxx>
*fingers crossed no one is relying on this bit of ABI*
Should definitely have always been as you have it now.
Applied to the togreg branch of iio.git - initially pushed out as testing
for the autobuilders to play with it.
Thanks,
Jonathan
> ---
> drivers/iio/pressure/ms5611.h | 3 ++-
> drivers/iio/pressure/ms5611_core.c | 5 +++--
> drivers/iio/pressure/ms5611_i2c.c | 2 +-
> drivers/iio/pressure/ms5611_spi.c | 4 ++--
> 4 files changed, 8 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/iio/pressure/ms5611.h b/drivers/iio/pressure/ms5611.h
> index 2d70dd6..8b08e4b 100644
> --- a/drivers/iio/pressure/ms5611.h
> +++ b/drivers/iio/pressure/ms5611.h
> @@ -51,7 +51,8 @@ struct ms5611_state {
> struct ms5611_chip_info *chip_info;
> };
>
> -int ms5611_probe(struct iio_dev *indio_dev, struct device *dev, int type);
> +int ms5611_probe(struct iio_dev *indio_dev, struct device *dev,
> + const char* name, int type);
> int ms5611_remove(struct iio_dev *indio_dev);
>
> #endif /* _MS5611_H */
> diff --git a/drivers/iio/pressure/ms5611_core.c b/drivers/iio/pressure/ms5611_core.c
> index 84ab8d2..acd8e37 100644
> --- a/drivers/iio/pressure/ms5611_core.c
> +++ b/drivers/iio/pressure/ms5611_core.c
> @@ -298,7 +298,8 @@ static int ms5611_init(struct iio_dev *indio_dev)
> return ms5611_read_prom(indio_dev);
> }
>
> -int ms5611_probe(struct iio_dev *indio_dev, struct device *dev, int type)
> +int ms5611_probe(struct iio_dev *indio_dev, struct device *dev,
> + const char *name, int type)
> {
> int ret;
> struct ms5611_state *st = iio_priv(indio_dev);
> @@ -306,7 +307,7 @@ int ms5611_probe(struct iio_dev *indio_dev, struct device *dev, int type)
> mutex_init(&st->lock);
> st->chip_info = &chip_info_tbl[type];
> indio_dev->dev.parent = dev;
> - indio_dev->name = dev->driver->name;
> + indio_dev->name = name;
> indio_dev->info = &ms5611_info;
> indio_dev->channels = ms5611_channels;
> indio_dev->num_channels = ARRAY_SIZE(ms5611_channels);
> diff --git a/drivers/iio/pressure/ms5611_i2c.c b/drivers/iio/pressure/ms5611_i2c.c
> index 42706a8..ae67539 100644
> --- a/drivers/iio/pressure/ms5611_i2c.c
> +++ b/drivers/iio/pressure/ms5611_i2c.c
> @@ -105,7 +105,7 @@ static int ms5611_i2c_probe(struct i2c_client *client,
> st->read_adc_temp_and_pressure = ms5611_i2c_read_adc_temp_and_pressure;
> st->client = client;
>
> - return ms5611_probe(indio_dev, &client->dev, id->driver_data);
> + return ms5611_probe(indio_dev, &client->dev, id->name, id->driver_data);
> }
>
> static int ms5611_i2c_remove(struct i2c_client *client)
> diff --git a/drivers/iio/pressure/ms5611_spi.c b/drivers/iio/pressure/ms5611_spi.c
> index c4bf4e8..5cc009e 100644
> --- a/drivers/iio/pressure/ms5611_spi.c
> +++ b/drivers/iio/pressure/ms5611_spi.c
> @@ -105,8 +105,8 @@ static int ms5611_spi_probe(struct spi_device *spi)
> st->read_adc_temp_and_pressure = ms5611_spi_read_adc_temp_and_pressure;
> st->client = spi;
>
> - return ms5611_probe(indio_dev, &spi->dev,
> - spi_get_device_id(spi)->driver_data);
> + return ms5611_probe(indio_dev, &spi->dev, spi_get_device_id(spi)->name,
> + spi_get_device_id(spi)->driver_data);
> }
>
> static int ms5611_spi_remove(struct spi_device *spi)
>
--
To unsubscribe from this list: send the line "unsubscribe linux-iio" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
