7 files changed, 38 insertions, 55 deletions

diff --git a/drivers/iio/magnetometer/Kconfig b/drivers/iio/magnetometer/Kconfig
index c332b0ae4a3b..4fa923f37b97 100644
--- a/drivers/iio/magnetometer/Kconfig
+++ b/drivers/iio/magnetometer/Kconfig
@@ -1,6 +1,8 @@
 #
 # Magnetometer sensors
 #
+# When adding new entries keep the list in alphabetical order
+
 menu "Magnetometer sensors"
 
 config AK8975
@@ -36,8 +38,8 @@ config IIO_ST_MAGN_3AXIS
           Say yes here to build support for STMicroelectronics magnetometers:
           LSM303DLHC, LSM303DLM, LIS3MDL.
 
-          This driver can also be built as a module. If so, will be created
-          these modules:
+          This driver can also be built as a module. If so, these modules
+          will be created:
           - st_magn (core functions for the driver [it is mandatory]);
           - st_magn_i2c (necessary for the I2C devices [optional*]);
           - st_magn_spi (necessary for the SPI devices [optional*]);
diff --git a/drivers/iio/magnetometer/Makefile b/drivers/iio/magnetometer/Makefile
index 7f328e37fbab..f91b1b68d392 100644
--- a/drivers/iio/magnetometer/Makefile
+++ b/drivers/iio/magnetometer/Makefile
@@ -2,6 +2,7 @@
 # Makefile for industrial I/O Magnetometer sensor drivers
 #
 
+# When adding new entries keep the list in alphabetical order
 obj-$(CONFIG_AK8975)    += ak8975.o
 obj-$(CONFIG_HID_SENSOR_MAGNETOMETER_3D) += hid-sensor-magn-3d.o
 
diff --git a/drivers/iio/magnetometer/hid-sensor-magn-3d.c b/drivers/iio/magnetometer/hid-sensor-magn-3d.c
index 99f4e494513b..a98460b15e4b 100644
--- a/drivers/iio/magnetometer/hid-sensor-magn-3d.c
+++ b/drivers/iio/magnetometer/hid-sensor-magn-3d.c
@@ -30,10 +30,6 @@
 #include <linux/iio/triggered_buffer.h>
 #include "../common/hid-sensors/hid-sensor-trigger.h"
 
-/*Format: HID-SENSOR-usage_id_in_hex*/
-/*Usage ID from spec for Magnetometer-3D: 0x200083*/
-#define DRIVER_NAME "HID-SENSOR-200083"
-
 enum magn_3d_channel {
         CHANNEL_SCAN_INDEX_X,
         CHANNEL_SCAN_INDEX_Y,
@@ -180,18 +176,10 @@ static int magn_3d_write_raw(struct iio_dev *indio_dev,
         return ret;
 }
 
-static int magn_3d_write_raw_get_fmt(struct iio_dev *indio_dev,
-                               struct iio_chan_spec const *chan,
-                               long mask)
-{
-        return IIO_VAL_INT_PLUS_MICRO;
-}
-
 static const struct iio_info magn_3d_info = {
         .driver_module = THIS_MODULE,
         .read_raw = &magn_3d_read_raw,
         .write_raw = &magn_3d_write_raw,
-        .write_raw_get_fmt = &magn_3d_write_raw_get_fmt,
 };
 
 /* Function to push data to buffer */
@@ -287,11 +275,11 @@ static int hid_magn_3d_probe(struct platform_device *pdev)
         struct hid_sensor_hub_device *hsdev = pdev->dev.platform_data;
         struct iio_chan_spec *channels;
 
-        indio_dev = iio_device_alloc(sizeof(struct magn_3d_state));
-        if (indio_dev == NULL) {
-                ret = -ENOMEM;
-                goto error_ret;
-        }
+        indio_dev = devm_iio_device_alloc(&pdev->dev,
+                                          sizeof(struct magn_3d_state));
+        if (indio_dev == NULL)
+                return -ENOMEM;
+
         platform_set_drvdata(pdev, indio_dev);
 
         magn_state = iio_priv(indio_dev);
@@ -303,15 +291,14 @@ static int hid_magn_3d_probe(struct platform_device *pdev)
                                 &magn_state->common_attributes);
         if (ret) {
                 dev_err(&pdev->dev, "failed to setup common attributes\n");
-                goto error_free_dev;
+                return ret;
         }
 
         channels = kmemdup(magn_3d_channels, sizeof(magn_3d_channels),
                            GFP_KERNEL);
         if (!channels) {
-                ret = -ENOMEM;
                 dev_err(&pdev->dev, "failed to duplicate channels\n");
-                goto error_free_dev;
+                return -ENOMEM;
         }
 
         ret = magn_3d_parse_report(pdev, hsdev, channels,
@@ -368,9 +355,6 @@ error_unreg_buffer_funcs:
         iio_triggered_buffer_cleanup(indio_dev);
 error_free_dev_mem:
         kfree(indio_dev->channels);
-error_free_dev:
-        iio_device_free(indio_dev);
-error_ret:
         return ret;
 }
 
@@ -385,14 +369,23 @@ static int hid_magn_3d_remove(struct platform_device *pdev)
         hid_sensor_remove_trigger(indio_dev);
         iio_triggered_buffer_cleanup(indio_dev);
         kfree(indio_dev->channels);
-        iio_device_free(indio_dev);
 
         return 0;
 }
 
+static struct platform_device_id hid_magn_3d_ids[] = {
+        {
+                /* Format: HID-SENSOR-usage_id_in_hex_lowercase */
+                .name = "HID-SENSOR-200083",
+        },
+        { /* sentinel */ }
+};
+MODULE_DEVICE_TABLE(platform, hid_magn_3d_ids);
+
 static struct platform_driver hid_magn_3d_platform_driver = {
+        .id_table = hid_magn_3d_ids,
         .driver = {
-                .name   = DRIVER_NAME,
+                .name   = KBUILD_MODNAME,
                 .owner  = THIS_MODULE,
         },
         .probe          = hid_magn_3d_probe,
diff --git a/drivers/iio/magnetometer/st_magn.h b/drivers/iio/magnetometer/st_magn.h
index 7e81d00ef0c3..694e33e0fb72 100644
--- a/drivers/iio/magnetometer/st_magn.h
+++ b/drivers/iio/magnetometer/st_magn.h
@@ -18,7 +18,8 @@
 #define LSM303DLM_MAGN_DEV_NAME         "lsm303dlm_magn"
 #define LIS3MDL_MAGN_DEV_NAME           "lis3mdl"
 
-int st_magn_common_probe(struct iio_dev *indio_dev);
+int st_magn_common_probe(struct iio_dev *indio_dev,
+                                        struct st_sensors_platform_data *pdata);
 void st_magn_common_remove(struct iio_dev *indio_dev);
 
 #ifdef CONFIG_IIO_BUFFER
diff --git a/drivers/iio/magnetometer/st_magn_core.c b/drivers/iio/magnetometer/st_magn_core.c
index ebfe8f11a0c2..e8d2849cc81d 100644
--- a/drivers/iio/magnetometer/st_magn_core.c
+++ b/drivers/iio/magnetometer/st_magn_core.c
@@ -345,7 +345,8 @@ static const struct iio_info magn_info = {
         .write_raw = &st_magn_write_raw,
 };
 
-int st_magn_common_probe(struct iio_dev *indio_dev)
+int st_magn_common_probe(struct iio_dev *indio_dev,
+                                        struct st_sensors_platform_data *pdata)
 {
         int err;
         struct st_sensor_data *mdata = iio_priv(indio_dev);
@@ -367,7 +368,7 @@ int st_magn_common_probe(struct iio_dev *indio_dev)
                                                 &mdata->sensor->fs.fs_avl[0];
         mdata->odr = mdata->sensor->odr.odr_avl[0].hz;
 
-        err = st_sensors_init_sensor(indio_dev);
+        err = st_sensors_init_sensor(indio_dev, pdata);
         if (err < 0)
                 goto st_magn_common_probe_error;
 
@@ -406,7 +407,6 @@ void st_magn_common_remove(struct iio_dev *indio_dev)
                 st_sensors_deallocate_trigger(indio_dev);
                 st_magn_deallocate_ring(indio_dev);
         }
-        iio_device_free(indio_dev);
 }
 EXPORT_SYMBOL(st_magn_common_remove);
 
diff --git a/drivers/iio/magnetometer/st_magn_i2c.c b/drivers/iio/magnetometer/st_magn_i2c.c
index e6adc4a86425..892e0feeb5c1 100644
--- a/drivers/iio/magnetometer/st_magn_i2c.c
+++ b/drivers/iio/magnetometer/st_magn_i2c.c
@@ -25,27 +25,20 @@ static int st_magn_i2c_probe(struct i2c_client *client,
         struct st_sensor_data *mdata;
         int err;
 
-        indio_dev = iio_device_alloc(sizeof(*mdata));
-        if (indio_dev == NULL) {
-                err = -ENOMEM;
-                goto iio_device_alloc_error;
-        }
+        indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*mdata));
+        if (!indio_dev)
+                return -ENOMEM;
 
         mdata = iio_priv(indio_dev);
         mdata->dev = &client->dev;
 
         st_sensors_i2c_configure(indio_dev, client, mdata);
 
-        err = st_magn_common_probe(indio_dev);
+        err = st_magn_common_probe(indio_dev, NULL);
         if (err < 0)
-                goto st_magn_common_probe_error;
+                return err;
 
         return 0;
-
-st_magn_common_probe_error:
-        iio_device_free(indio_dev);
-iio_device_alloc_error:
-        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 51adb797cb7d..a6143ea51dfc 100644
--- a/drivers/iio/magnetometer/st_magn_spi.c
+++ b/drivers/iio/magnetometer/st_magn_spi.c
@@ -24,27 +24,20 @@ static int st_magn_spi_probe(struct spi_device *spi)
         struct st_sensor_data *mdata;
         int err;
 
-        indio_dev = iio_device_alloc(sizeof(*mdata));
-        if (indio_dev == NULL) {
-                err = -ENOMEM;
-                goto iio_device_alloc_error;
-        }
+        indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*mdata));
+        if (!indio_dev)
+                return -ENOMEM;
 
         mdata = iio_priv(indio_dev);
         mdata->dev = &spi->dev;
 
         st_sensors_spi_configure(indio_dev, spi, mdata);
 
-        err = st_magn_common_probe(indio_dev);
+        err = st_magn_common_probe(indio_dev, NULL);
         if (err < 0)
-                goto st_magn_common_probe_error;
+                return err;
 
         return 0;
-
-st_magn_common_probe_error:
-        iio_device_free(indio_dev);
-iio_device_alloc_error:
-        return err;
 }
 
 static int st_magn_spi_remove(struct spi_device *spi)