| From ddf9cca4eef13e018bc6b61de09e5b18e458a873 Mon Sep 17 00:00:00 2001 |
| From: YueHaibing <yuehaibing@huawei.com> |
| Date: Mon, 11 Nov 2019 11:21:15 +0800 |
| Subject: [PATCH] iio: st_accel: Fix unused variable warning |
| |
| commit 0163c1c521ff8b09cd8ca395003cc00178161d77 upstream. |
| |
| drivers/iio/accel/st_accel_core.c:1005:44: warning: |
| mount_matrix_ext_info defined but not used [-Wunused-const-variable=] |
| |
| Using stub helper while CONFIG_ACPI is disabled to fix it. |
| |
| Suggested-by: Ladislav Michl <ladis@linux-mips.org> |
| Signed-off-by: YueHaibing <yuehaibing@huawei.com> |
| Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/iio/accel/st_accel_core.c b/drivers/iio/accel/st_accel_core.c |
| index e02b79931979..9e4d00a20359 100644 |
| --- a/drivers/iio/accel/st_accel_core.c |
| +++ b/drivers/iio/accel/st_accel_core.c |
| @@ -994,6 +994,7 @@ static const struct iio_trigger_ops st_accel_trigger_ops = { |
| #define ST_ACCEL_TRIGGER_OPS NULL |
| #endif |
| |
| +#ifdef CONFIG_ACPI |
| static const struct iio_mount_matrix * |
| get_mount_matrix(const struct iio_dev *indio_dev, |
| const struct iio_chan_spec *chan) |
| @@ -1014,7 +1015,6 @@ static const struct iio_chan_spec_ext_info mount_matrix_ext_info[] = { |
| static int apply_acpi_orientation(struct iio_dev *indio_dev, |
| struct iio_chan_spec *channels) |
| { |
| -#ifdef CONFIG_ACPI |
| struct st_sensor_data *adata = iio_priv(indio_dev); |
| struct acpi_buffer buffer = {ACPI_ALLOCATE_BUFFER, NULL}; |
| struct acpi_device *adev; |
| @@ -1142,10 +1142,14 @@ static int apply_acpi_orientation(struct iio_dev *indio_dev, |
| out: |
| kfree(buffer.pointer); |
| return ret; |
| +} |
| #else /* !CONFIG_ACPI */ |
| +static int apply_acpi_orientation(struct iio_dev *indio_dev, |
| + struct iio_chan_spec *channels) |
| +{ |
| return 0; |
| -#endif |
| } |
| +#endif |
| |
| int st_accel_common_probe(struct iio_dev *indio_dev) |
| { |
| -- |
| 2.7.4 |
| |
