Commit 8d78d1e1 authored by Linus Walleij's avatar Linus Walleij Committed by Jonathan Cameron
Browse files

iio: accel: st_sensors: Stop copying channels 



The channels were copied only so that the .ext_info member should become
assignable. We now have compile-time static assignment so drop this code.

Cc: Hans de Goede <hdegoede@redhat.com>
Cc: Denis Ciocca <denis.ciocca@st.com>
Cc: Daniel Drake <drake@endlessm.com>
Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarStephan Gerhold <stephan@gerhold.net>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Reviewed-by: default avatarHans de Goede <hdegoede@redhat.com>
Link: https://lore.kernel.org/r/20210518230722.522446-3-linus.walleij@linaro.org


Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
parent 3d8ad94b

drivers/iio/accel/st_accel_core.c

+1 −10
Original line number Original line Diff line number Diff line
@@ -1339,8 +1339,6 @@ int st_accel_common_probe(struct iio_dev *indio_dev) 
{

{

	struct st_sensor_data *adata = iio_priv(indio_dev);

	struct st_sensor_data *adata = iio_priv(indio_dev);

	struct st_sensors_platform_data *pdata = dev_get_platdata(adata->dev);

	struct st_sensors_platform_data *pdata = dev_get_platdata(adata->dev);

	struct iio_chan_spec *channels;

	size_t channels_size;

	int err;

	int err;





	indio_dev->modes = INDIO_DIRECT_MODE;

	indio_dev->modes = INDIO_DIRECT_MODE;
@@ -1351,15 +1349,9 @@ int st_accel_common_probe(struct iio_dev *indio_dev) 
		return err;

		return err;





	adata->num_data_channels = ST_ACCEL_NUMBER_DATA_CHANNELS;

	adata->num_data_channels = ST_ACCEL_NUMBER_DATA_CHANNELS;

	indio_dev->channels = adata->sensor_settings->ch;

	indio_dev->num_channels = ST_SENSORS_NUMBER_ALL_CHANNELS;

	indio_dev->num_channels = ST_SENSORS_NUMBER_ALL_CHANNELS;





	channels_size = indio_dev->num_channels * sizeof(struct iio_chan_spec);

	channels = devm_kmemdup(&indio_dev->dev,

				adata->sensor_settings->ch,

				channels_size, GFP_KERNEL);

	if (!channels)

		return -ENOMEM;



	/*

	/*

	 * First try specific ACPI methods to retrieve orientation then try the

	 * First try specific ACPI methods to retrieve orientation then try the

	 * generic function.

	 * generic function.
@@ -1371,7 +1363,6 @@ int st_accel_common_probe(struct iio_dev *indio_dev) 
			return err;

			return err;

	}

	}





	indio_dev->channels = channels;

	adata->current_fullscale = &adata->sensor_settings->fs.fs_avl[0];

	adata->current_fullscale = &adata->sensor_settings->fs.fs_avl[0];

	adata->odr = adata->sensor_settings->odr.odr_avl[0].hz;

	adata->odr = adata->sensor_settings->odr.odr_avl[0].hz;