iio: accel: st_accel: rename H3LIS331DL_DRIVER_NAME in H3LIS331DL_ACCEL_DEV_NAME
authorLorenzo Bianconi <lorenzo.bianconi83@gmail.com>
Sat, 8 Jul 2017 11:00:18 +0000 (13:00 +0200)
committerJonathan Cameron <Jonathan.Cameron@huawei.com>
Sun, 9 Jul 2017 18:19:17 +0000 (19:19 +0100)
In order to use the standard name convention rename H3LIS331DL_DRIVER_NAME
macro in H3LIS331DL_ACCEL_DEV_NAME

Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi@st.com>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
drivers/iio/accel/st_accel.h
drivers/iio/accel/st_accel_core.c
drivers/iio/accel/st_accel_i2c.c
drivers/iio/accel/st_accel_spi.c

index fe3864f0f1469c3b010da1b236fc9f1b06305e50..0fe521609a3a78ec33d28e0d96a074c1f79c4668 100644 (file)
@@ -35,7 +35,7 @@ enum st_accel_type {
        ST_ACCEL_MAX,
 };
 
-#define H3LIS331DL_DRIVER_NAME         "h3lis331dl_accel"
+#define H3LIS331DL_ACCEL_DEV_NAME      "h3lis331dl_accel"
 #define LIS3LV02DL_ACCEL_DEV_NAME      "lis3lv02dl_accel"
 #define LSM303DLHC_ACCEL_DEV_NAME      "lsm303dlhc_accel"
 #define LIS3DH_ACCEL_DEV_NAME          "lis3dh"
index 07d1489cd457a6b5445b8b3ba35dad95b1792acc..c7709494bed3ce8f7618048eb8d45f605ffdd968 100644 (file)
@@ -444,7 +444,7 @@ static const struct st_sensor_settings st_accel_sensors_settings[] = {
                .wai = 0x32,
                .wai_addr = ST_SENSORS_DEFAULT_WAI_ADDRESS,
                .sensors_supported = {
-                       [0] = H3LIS331DL_DRIVER_NAME,
+                       [0] = H3LIS331DL_ACCEL_DEV_NAME,
                },
                .ch = (struct iio_chan_spec *)st_accel_12bit_channels,
                .odr = {
index 1b22c5714e898a7749a97d1e8fce8bde3faa5dec..18cafb9f2468d8316ec58314112f8abcdca02534 100644 (file)
@@ -84,7 +84,7 @@ static const struct of_device_id st_accel_of_match[] = {
        },
        {
                .compatible = "st,h3lis331dl-accel",
-               .data = H3LIS331DL_DRIVER_NAME,
+               .data = H3LIS331DL_ACCEL_DEV_NAME,
        },
        {
                .compatible = "st,lis3l02dq",
@@ -126,7 +126,7 @@ static const struct i2c_device_id st_accel_id_table[] = {
        { LIS2DH12_ACCEL_DEV_NAME, LIS2DH12 },
        { LIS3L02DQ_ACCEL_DEV_NAME, LIS3L02DQ },
        { LNG2DM_ACCEL_DEV_NAME, LNG2DM },
-       { H3LIS331DL_DRIVER_NAME, H3LIS331DL },
+       { H3LIS331DL_ACCEL_DEV_NAME, H3LIS331DL },
        { LIS331DL_ACCEL_DEV_NAME, LIS331DL },
        { LIS3LV02DL_ACCEL_DEV_NAME, LIS3LV02DL },
        {},
index 7a2a0384b42d805d4d75aa819b3803fda41d31c4..915fa49085f7076b74de72e717e1a6858e504240 100644 (file)
@@ -76,7 +76,7 @@ static const struct of_device_id st_accel_of_match[] = {
        },
        {
                .compatible = "st,h3lis331dl-accel",
-               .data = H3LIS331DL_DRIVER_NAME,
+               .data = H3LIS331DL_ACCEL_DEV_NAME,
        },
        {
                .compatible = "st,lis331dl-accel",
@@ -130,7 +130,7 @@ static const struct spi_device_id st_accel_id_table[] = {
        { LIS2DH12_ACCEL_DEV_NAME },
        { LIS3L02DQ_ACCEL_DEV_NAME },
        { LNG2DM_ACCEL_DEV_NAME },
-       { H3LIS331DL_DRIVER_NAME },
+       { H3LIS331DL_ACCEL_DEV_NAME },
        { LIS331DL_ACCEL_DEV_NAME },
        { LIS3LV02DL_ACCEL_DEV_NAME },
        {},