* [PATCH 1/4] iio:accel: call device unregister function if common_proble fails
@ 2014-02-14 14:55 Denis CIOCCA
2014-02-14 14:55 ` [PATCH 2/4] iio:gyro: " Denis CIOCCA
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Denis CIOCCA @ 2014-02-14 14:55 UTC (permalink / raw)
To: linux-iio; +Cc: Denis Ciocca
If st_accel_common_probe function fails, the device must be unregistered.
Used devm_iio_device_unregister function instead of iio_device_unregister
also in the common remove function.
Signed-off-by: Denis Ciocca <denis.ciocca@st.com>
---
drivers/iio/accel/st_accel_core.c | 2 +-
drivers/iio/accel/st_accel_i2c.c | 6 +++++-
drivers/iio/accel/st_accel_spi.c | 6 +++++-
3 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/drivers/iio/accel/st_accel_core.c b/drivers/iio/accel/st_accel_core.c
index 38caedc..72d560f 100644
--- a/drivers/iio/accel/st_accel_core.c
+++ b/drivers/iio/accel/st_accel_core.c
@@ -512,7 +512,7 @@ void st_accel_common_remove(struct iio_dev *indio_dev)
{
struct st_sensor_data *adata = iio_priv(indio_dev);
- iio_device_unregister(indio_dev);
+ devm_iio_device_unregister(adata->dev, indio_dev);
if (adata->get_irq_data_ready(indio_dev) > 0)
st_sensors_deallocate_trigger(indio_dev);
diff --git a/drivers/iio/accel/st_accel_i2c.c b/drivers/iio/accel/st_accel_i2c.c
index d7bedbd..a31473d 100644
--- a/drivers/iio/accel/st_accel_i2c.c
+++ b/drivers/iio/accel/st_accel_i2c.c
@@ -36,9 +36,13 @@ static int st_accel_i2c_probe(struct i2c_client *client,
err = st_accel_common_probe(indio_dev, client->dev.platform_data);
if (err < 0)
- return err;
+ goto device_unregister;
return 0;
+
+device_unregister:
+ devm_iio_device_unregister(&client->dev, indio_dev);
+ return err;
}
static int st_accel_i2c_remove(struct i2c_client *client)
diff --git a/drivers/iio/accel/st_accel_spi.c b/drivers/iio/accel/st_accel_spi.c
index 1956396..e687722 100644
--- a/drivers/iio/accel/st_accel_spi.c
+++ b/drivers/iio/accel/st_accel_spi.c
@@ -35,9 +35,13 @@ static int st_accel_spi_probe(struct spi_device *spi)
err = st_accel_common_probe(indio_dev, spi->dev.platform_data);
if (err < 0)
- return err;
+ goto device_unregister;
return 0;
+
+device_unregister:
+ devm_iio_device_unregister(&spi->dev, indio_dev);
+ return err;
}
static int st_accel_spi_remove(struct spi_device *spi)
--
1.8.5.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/4] iio:gyro: call device unregister function if common_proble fails
2014-02-14 14:55 [PATCH 1/4] iio:accel: call device unregister function if common_proble fails Denis CIOCCA
@ 2014-02-14 14:55 ` Denis CIOCCA
2014-02-14 14:55 ` [PATCH 3/4] iio:magnetometer: " Denis CIOCCA
2014-02-14 14:55 ` [PATCH 4/4] iio:pressure: " Denis CIOCCA
2 siblings, 0 replies; 4+ messages in thread
From: Denis CIOCCA @ 2014-02-14 14:55 UTC (permalink / raw)
To: linux-iio; +Cc: Denis Ciocca
If st_gyro_common_probe function fails, the device must be unregistered.
Used devm_iio_device_unregister function instead of iio_device_unregister
also in the common remove function.
Signed-off-by: Denis Ciocca <denis.ciocca@st.com>
---
drivers/iio/gyro/st_gyro_core.c | 2 +-
drivers/iio/gyro/st_gyro_i2c.c | 6 +++++-
drivers/iio/gyro/st_gyro_spi.c | 6 +++++-
3 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/drivers/iio/gyro/st_gyro_core.c b/drivers/iio/gyro/st_gyro_core.c
index a8e174a..67f88ed 100644
--- a/drivers/iio/gyro/st_gyro_core.c
+++ b/drivers/iio/gyro/st_gyro_core.c
@@ -360,7 +360,7 @@ void st_gyro_common_remove(struct iio_dev *indio_dev)
{
struct st_sensor_data *gdata = iio_priv(indio_dev);
- iio_device_unregister(indio_dev);
+ devm_iio_device_unregister(gdata->dev, indio_dev);
if (gdata->get_irq_data_ready(indio_dev) > 0)
st_sensors_deallocate_trigger(indio_dev);
diff --git a/drivers/iio/gyro/st_gyro_i2c.c b/drivers/iio/gyro/st_gyro_i2c.c
index 23c12f3..41def78 100644
--- a/drivers/iio/gyro/st_gyro_i2c.c
+++ b/drivers/iio/gyro/st_gyro_i2c.c
@@ -37,9 +37,13 @@ static int st_gyro_i2c_probe(struct i2c_client *client,
err = st_gyro_common_probe(indio_dev,
(struct st_sensors_platform_data *)&gyro_pdata);
if (err < 0)
- return err;
+ goto device_unregister;
return 0;
+
+device_unregister:
+ devm_iio_device_unregister(&client->dev, indio_dev);
+ return err;
}
static int st_gyro_i2c_remove(struct i2c_client *client)
diff --git a/drivers/iio/gyro/st_gyro_spi.c b/drivers/iio/gyro/st_gyro_spi.c
index b4ad3be..9fc1a57 100644
--- a/drivers/iio/gyro/st_gyro_spi.c
+++ b/drivers/iio/gyro/st_gyro_spi.c
@@ -36,9 +36,13 @@ static int st_gyro_spi_probe(struct spi_device *spi)
err = st_gyro_common_probe(indio_dev,
(struct st_sensors_platform_data *)&gyro_pdata);
if (err < 0)
- return err;
+ goto device_unregister;
return 0;
+
+device_unregister:
+ devm_iio_device_unregister(&spi->dev, indio_dev);
+ return err;
}
static int st_gyro_spi_remove(struct spi_device *spi)
--
1.8.5.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 3/4] iio:magnetometer: call device unregister function if common_proble fails
2014-02-14 14:55 [PATCH 1/4] iio:accel: call device unregister function if common_proble fails Denis CIOCCA
2014-02-14 14:55 ` [PATCH 2/4] iio:gyro: " Denis CIOCCA
@ 2014-02-14 14:55 ` Denis CIOCCA
2014-02-14 14:55 ` [PATCH 4/4] iio:pressure: " Denis CIOCCA
2 siblings, 0 replies; 4+ messages in thread
From: Denis CIOCCA @ 2014-02-14 14:55 UTC (permalink / raw)
To: linux-iio; +Cc: Denis Ciocca
If st_magn_common_probe function fails, the device must be unregistered.
Used devm_iio_device_unregister function instead of iio_device_unregister
also in the common remove function.
Signed-off-by: Denis Ciocca <denis.ciocca@st.com>
---
drivers/iio/magnetometer/st_magn_core.c | 2 +-
drivers/iio/magnetometer/st_magn_i2c.c | 6 +++++-
drivers/iio/magnetometer/st_magn_spi.c | 6 +++++-
3 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/drivers/iio/magnetometer/st_magn_core.c b/drivers/iio/magnetometer/st_magn_core.c
index 52bbcfa..344b9cd 100644
--- a/drivers/iio/magnetometer/st_magn_core.c
+++ b/drivers/iio/magnetometer/st_magn_core.c
@@ -403,7 +403,7 @@ void st_magn_common_remove(struct iio_dev *indio_dev)
{
struct st_sensor_data *mdata = iio_priv(indio_dev);
- iio_device_unregister(indio_dev);
+ devm_iio_device_unregister(mdata->dev, indio_dev);
if (mdata->get_irq_data_ready(indio_dev) > 0)
st_sensors_deallocate_trigger(indio_dev);
diff --git a/drivers/iio/magnetometer/st_magn_i2c.c b/drivers/iio/magnetometer/st_magn_i2c.c
index 892e0fe..02c6da1 100644
--- a/drivers/iio/magnetometer/st_magn_i2c.c
+++ b/drivers/iio/magnetometer/st_magn_i2c.c
@@ -36,9 +36,13 @@ static int st_magn_i2c_probe(struct i2c_client *client,
err = st_magn_common_probe(indio_dev, NULL);
if (err < 0)
- return err;
+ goto device_unregister;
return 0;
+
+device_unregister:
+ devm_iio_device_unregister(&client->dev, indio_dev);
+ return err;
}
static int st_magn_i2c_remove(struct i2c_client *client)
diff --git a/drivers/iio/magnetometer/st_magn_spi.c b/drivers/iio/magnetometer/st_magn_spi.c
index a6143ea..5c2f6fa 100644
--- a/drivers/iio/magnetometer/st_magn_spi.c
+++ b/drivers/iio/magnetometer/st_magn_spi.c
@@ -35,9 +35,13 @@ static int st_magn_spi_probe(struct spi_device *spi)
err = st_magn_common_probe(indio_dev, NULL);
if (err < 0)
- return err;
+ goto device_unregister;
return 0;
+
+device_unregister:
+ devm_iio_device_unregister(&spi->dev, indio_dev);
+ return err;
}
static int st_magn_spi_remove(struct spi_device *spi)
--
1.8.5.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 4/4] iio:pressure: call device unregister function if common_proble fails
2014-02-14 14:55 [PATCH 1/4] iio:accel: call device unregister function if common_proble fails Denis CIOCCA
2014-02-14 14:55 ` [PATCH 2/4] iio:gyro: " Denis CIOCCA
2014-02-14 14:55 ` [PATCH 3/4] iio:magnetometer: " Denis CIOCCA
@ 2014-02-14 14:55 ` Denis CIOCCA
2 siblings, 0 replies; 4+ messages in thread
From: Denis CIOCCA @ 2014-02-14 14:55 UTC (permalink / raw)
To: linux-iio; +Cc: Denis Ciocca
If st_press_common_probe function fails, the device must be unregistered.
Used devm_iio_device_unregister function instead of iio_device_unregister
also in the common remove function.
Signed-off-by: Denis Ciocca <denis.ciocca@st.com>
---
drivers/iio/pressure/st_pressure_core.c | 2 +-
drivers/iio/pressure/st_pressure_i2c.c | 6 +++++-
drivers/iio/pressure/st_pressure_spi.c | 6 +++++-
3 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/drivers/iio/pressure/st_pressure_core.c b/drivers/iio/pressure/st_pressure_core.c
index 58083f9..99170dd 100644
--- a/drivers/iio/pressure/st_pressure_core.c
+++ b/drivers/iio/pressure/st_pressure_core.c
@@ -419,7 +419,7 @@ void st_press_common_remove(struct iio_dev *indio_dev)
st_press_power_disable(indio_dev);
- iio_device_unregister(indio_dev);
+ devm_iio_device_unregister(pdata->dev, indio_dev);
if (pdata->get_irq_data_ready(indio_dev) > 0)
st_sensors_deallocate_trigger(indio_dev);
diff --git a/drivers/iio/pressure/st_pressure_i2c.c b/drivers/iio/pressure/st_pressure_i2c.c
index 51eab7f..9ccfc19 100644
--- a/drivers/iio/pressure/st_pressure_i2c.c
+++ b/drivers/iio/pressure/st_pressure_i2c.c
@@ -36,9 +36,13 @@ static int st_press_i2c_probe(struct i2c_client *client,
err = st_press_common_probe(indio_dev, client->dev.platform_data);
if (err < 0)
- return err;
+ goto device_unregister;
return 0;
+
+device_unregister:
+ devm_iio_device_unregister(&client->dev, indio_dev);
+ return err;
}
static int st_press_i2c_remove(struct i2c_client *client)
diff --git a/drivers/iio/pressure/st_pressure_spi.c b/drivers/iio/pressure/st_pressure_spi.c
index 27322af..3af81c0 100644
--- a/drivers/iio/pressure/st_pressure_spi.c
+++ b/drivers/iio/pressure/st_pressure_spi.c
@@ -35,9 +35,13 @@ static int st_press_spi_probe(struct spi_device *spi)
err = st_press_common_probe(indio_dev, spi->dev.platform_data);
if (err < 0)
- return err;
+ goto device_unregister;
return 0;
+
+device_unregister:
+ devm_iio_device_unregister(&spi->dev, indio_dev);
+ return err;
}
static int st_press_spi_remove(struct spi_device *spi)
--
1.8.5.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-02-14 15:16 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-02-14 14:55 [PATCH 1/4] iio:accel: call device unregister function if common_proble fails Denis CIOCCA
2014-02-14 14:55 ` [PATCH 2/4] iio:gyro: " Denis CIOCCA
2014-02-14 14:55 ` [PATCH 3/4] iio:magnetometer: " Denis CIOCCA
2014-02-14 14:55 ` [PATCH 4/4] iio:pressure: " Denis CIOCCA
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).