On Mon, 11 Nov 2019 11:21:15 +0800
YueHaibing <yuehaibing@xxxxxxxxxx> wrote:
> 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@xxxxxxxxxxxxxx>
> Signed-off-by: YueHaibing <yuehaibing@xxxxxxxxxx>
Applied to the fixes-togreg branch of iio.git as I've now closed for new
things for the coming merge window. This will go upstream after the merge
window closes and probably hit around rc2. Thanks for cleaning this up.
Jonathan
> ---
> drivers/iio/accel/st_accel_core.c | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/iio/accel/st_accel_core.c b/drivers/iio/accel/st_accel_core.c
> index 7b83764..7320275 100644
> --- a/drivers/iio/accel/st_accel_core.c
> +++ b/drivers/iio/accel/st_accel_core.c
> @@ -992,6 +992,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)
> @@ -1012,7 +1013,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;
> @@ -1140,10 +1140,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
>
> /*
> * st_accel_get_settings() - get sensor settings from device name
