Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 7fc5ad7e97a690ccd05ad2556c1bfb687692f215

Authored by Sachin Kamat
Committed by Jonathan Cameron
1 parent 907c0a0ae0
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

iio: magnetometer: st_magn: Use devm_iio_device_alloc 

Using devm_iio_device_alloc makes code simpler.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Cc: Denis Ciocca <denis.ciocca@st.com>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>

Showing 3 changed files with 8 additions and 23 deletions Side-by-side Diff

drivers/iio/magnetometer/st_magn_core.c
Diff comments   View file @ 7fc5ad7
... ... @@ -407,7 +407,6 @@
407 407 st_sensors_deallocate_trigger(indio_dev);
408 408 st_magn_deallocate_ring(indio_dev);
409 409 }
410   - iio_device_free(indio_dev);
411 410 }
412 411 EXPORT_SYMBOL(st_magn_common_remove);
413 412  
drivers/iio/magnetometer/st_magn_i2c.c
Diff comments   View file @ 7fc5ad7
... ... @@ -25,11 +25,9 @@
25 25 struct st_sensor_data *mdata;
26 26 int err;
27 27  
28   - indio_dev = iio_device_alloc(sizeof(*mdata));
29   - if (indio_dev == NULL) {
30   - err = -ENOMEM;
31   - goto iio_device_alloc_error;
32   - }
  28 + indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*mdata));
  29 + if (!indio_dev)
  30 + return -ENOMEM;
33 31  
34 32 mdata = iio_priv(indio_dev);
35 33 mdata->dev = &client->dev;
36 34  
... ... @@ -38,14 +36,9 @@
38 36  
39 37 err = st_magn_common_probe(indio_dev, NULL);
40 38 if (err < 0)
41   - goto st_magn_common_probe_error;
  39 + return err;
42 40  
43 41 return 0;
44   -
45   -st_magn_common_probe_error:
46   - iio_device_free(indio_dev);
47   -iio_device_alloc_error:
48   - return err;
49 42 }
50 43  
51 44 static int st_magn_i2c_remove(struct i2c_client *client)
drivers/iio/magnetometer/st_magn_spi.c
Diff comments   View file @ 7fc5ad7
... ... @@ -24,11 +24,9 @@
24 24 struct st_sensor_data *mdata;
25 25 int err;
26 26  
27   - indio_dev = iio_device_alloc(sizeof(*mdata));
28   - if (indio_dev == NULL) {
29   - err = -ENOMEM;
30   - goto iio_device_alloc_error;
31   - }
  27 + indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*mdata));
  28 + if (!indio_dev)
  29 + return -ENOMEM;
32 30  
33 31 mdata = iio_priv(indio_dev);
34 32 mdata->dev = &spi->dev;
35 33  
... ... @@ -37,14 +35,9 @@
37 35  
38 36 err = st_magn_common_probe(indio_dev, NULL);
39 37 if (err < 0)
40   - goto st_magn_common_probe_error;
  38 + return err;
41 39  
42 40 return 0;
43   -
44   -st_magn_common_probe_error:
45   - iio_device_free(indio_dev);
46   -iio_device_alloc_error:
47   - return err;
48 41 }
49 42  
50 43 static int st_magn_spi_remove(struct spi_device *spi)