leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

iio:pressure: Removed unnecessary parameter on common_probe function

Browse Source 
Signed-off-by: Denis Ciocca <denis.ciocca@st.com>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
This commit is contained in:
Denis CIOCCA
2014-10-03 17:35:39 +02:00
committed by Jonathan Cameron
parent 2109eb4c0c
commit 0baa3fc1b6
4 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/iio/pressure/st_pressure.h
View File

@@ -26,8 +26,7 @@ static const struct st_sensors_platform_data default_press_pdata = {
.drdy_int_pin = 1, .drdy_int_pin = 1,
}; };
int st_press_common_probe(struct iio_dev *indio_dev, int st_press_common_probe(struct iio_dev *indio_dev);
struct st_sensors_platform_data *pdata);
void st_press_common_remove(struct iio_dev *indio_dev); void st_press_common_remove(struct iio_dev *indio_dev);
#ifdef CONFIG_IIO_BUFFER #ifdef CONFIG_IIO_BUFFER

9
drivers/iio/pressure/st_pressure_core.c
View File

@@ -409,8 +409,7 @@ static const struct iio_trigger_ops st_press_trigger_ops = {
#define ST_PRESS_TRIGGER_OPS NULL #define ST_PRESS_TRIGGER_OPS NULL
#endif #endif
int st_press_common_probe(struct iio_dev *indio_dev, int st_press_common_probe(struct iio_dev *indio_dev)
struct st_sensors_platform_data *plat_data)
{ {
struct st_sensor_data *pdata = iio_priv(indio_dev); struct st_sensor_data *pdata = iio_priv(indio_dev);
int irq = pdata->get_irq_data_ready(indio_dev); int irq = pdata->get_irq_data_ready(indio_dev);
@@ -439,11 +438,11 @@ int st_press_common_probe(struct iio_dev *indio_dev,
pdata->odr = pdata->sensor_settings->odr.odr_avl[0].hz; pdata->odr = pdata->sensor_settings->odr.odr_avl[0].hz;
/* Some devices don't support a data ready pin. */ /* Some devices don't support a data ready pin. */
if (!plat_data && pdata->sensor_settings->drdy_irq.addr) if (!pdata->dev->platform_data && pdata->sensor_settings->drdy_irq.addr)
plat_data = pdata->dev->platform_data =
(struct st_sensors_platform_data *)&default_press_pdata; (struct st_sensors_platform_data *)&default_press_pdata;
err = st_sensors_init_sensor(indio_dev, plat_data); err = st_sensors_init_sensor(indio_dev, pdata->dev->platform_data);
if (err < 0) if (err < 0)
return err; return err;

2
drivers/iio/pressure/st_pressure_i2c.c
View File

@@ -56,7 +56,7 @@ static int st_press_i2c_probe(struct i2c_client *client,
st_sensors_i2c_configure(indio_dev, client, pdata); st_sensors_i2c_configure(indio_dev, client, pdata);
err = st_press_common_probe(indio_dev, client->dev.platform_data); err = st_press_common_probe(indio_dev);
if (err < 0) if (err < 0)
return err; return err;

2
drivers/iio/pressure/st_pressure_spi.c
View File

@@ -33,7 +33,7 @@ static int st_press_spi_probe(struct spi_device *spi)
st_sensors_spi_configure(indio_dev, spi, pdata); st_sensors_spi_configure(indio_dev, spi, pdata);
err = st_press_common_probe(indio_dev, spi->dev.platform_data); err = st_press_common_probe(indio_dev);
if (err < 0) if (err < 0)
return err; return err;