Commit eac635eb authored by Grégor Boirie's avatar Grégor Boirie Committed by Jonathan Cameron

iio:pressure:ms5611: use probed device name

Use name of probed device instead of driver's one when registering device.
Signed-off-by: default avatarGregor Boirie <gregor.boirie@parrot.com>
Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
parent ce5b8fc1
...@@ -51,7 +51,8 @@ struct ms5611_state { ...@@ -51,7 +51,8 @@ struct ms5611_state {
struct ms5611_chip_info *chip_info; 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); int ms5611_remove(struct iio_dev *indio_dev);
#endif /* _MS5611_H */ #endif /* _MS5611_H */
...@@ -298,7 +298,8 @@ static int ms5611_init(struct iio_dev *indio_dev) ...@@ -298,7 +298,8 @@ static int ms5611_init(struct iio_dev *indio_dev)
return ms5611_read_prom(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; int ret;
struct ms5611_state *st = iio_priv(indio_dev); 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) ...@@ -306,7 +307,7 @@ int ms5611_probe(struct iio_dev *indio_dev, struct device *dev, int type)
mutex_init(&st->lock); mutex_init(&st->lock);
st->chip_info = &chip_info_tbl[type]; st->chip_info = &chip_info_tbl[type];
indio_dev->dev.parent = dev; indio_dev->dev.parent = dev;
indio_dev->name = dev->driver->name; indio_dev->name = name;
indio_dev->info = &ms5611_info; indio_dev->info = &ms5611_info;
indio_dev->channels = ms5611_channels; indio_dev->channels = ms5611_channels;
indio_dev->num_channels = ARRAY_SIZE(ms5611_channels); indio_dev->num_channels = ARRAY_SIZE(ms5611_channels);
......
...@@ -105,7 +105,7 @@ static int ms5611_i2c_probe(struct i2c_client *client, ...@@ -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->read_adc_temp_and_pressure = ms5611_i2c_read_adc_temp_and_pressure;
st->client = client; 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) static int ms5611_i2c_remove(struct i2c_client *client)
......
...@@ -105,8 +105,8 @@ static int ms5611_spi_probe(struct spi_device *spi) ...@@ -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->read_adc_temp_and_pressure = ms5611_spi_read_adc_temp_and_pressure;
st->client = spi; st->client = spi;
return ms5611_probe(indio_dev, &spi->dev, return ms5611_probe(indio_dev, &spi->dev, spi_get_device_id(spi)->name,
spi_get_device_id(spi)->driver_data); spi_get_device_id(spi)->driver_data);
} }
static int ms5611_spi_remove(struct spi_device *spi) static int ms5611_spi_remove(struct spi_device *spi)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment