On Wed, 15 Jan 2020 19:44:24 +0200
Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx> wrote:
> Since IIO framework supports device property API and driver has been moved
> already to the use of GPIO descriptors the logical continuation is to
> get rid of platform data completely. We are on the safe side here since
> there are no users of it in the kernel.
>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx>
Hmm. Fair enough I guess.
Applied to the togreg branch of iio.git and pushed out as testing
Thanks,
Jonathan
> ---
> drivers/iio/magnetometer/ak8975.c | 14 +++-----------
> include/linux/iio/magnetometer/ak8975.h | 15 ---------------
> 2 files changed, 3 insertions(+), 26 deletions(-)
> delete mode 100644 include/linux/iio/magnetometer/ak8975.h
>
> diff --git a/drivers/iio/magnetometer/ak8975.c b/drivers/iio/magnetometer/ak8975.c
> index 55cffaa82456..8e50e073bcbf 100644
> --- a/drivers/iio/magnetometer/ak8975.c
> +++ b/drivers/iio/magnetometer/ak8975.c
> @@ -28,8 +28,6 @@
> #include <linux/iio/trigger_consumer.h>
> #include <linux/iio/triggered_buffer.h>
>
> -#include <linux/iio/magnetometer/ak8975.h>
> -
> /*
> * Register definitions, as well as various shifts and masks to get at the
> * individual fields of the registers.
> @@ -857,8 +855,6 @@ static int ak8975_probe(struct i2c_client *client,
> int err;
> const char *name = NULL;
> enum asahi_compass_chipset chipset = AK_MAX_TYPE;
> - const struct ak8975_platform_data *pdata =
> - dev_get_platdata(&client->dev);
>
> /*
> * Grab and set up the supplied GPIO.
> @@ -883,13 +879,9 @@ static int ak8975_probe(struct i2c_client *client,
> data->eoc_gpiod = eoc_gpiod;
> data->eoc_irq = 0;
>
> - if (!pdata) {
> - err = iio_read_mount_matrix(&client->dev, "mount-matrix",
> - &data->orientation);
> - if (err)
> - return err;
> - } else
> - data->orientation = pdata->orientation;
> + err = iio_read_mount_matrix(&client->dev, "mount-matrix", &data->orientation);
> + if (err)
> + return err;
>
> /* id will be NULL when enumerated via ACPI */
> if (id) {
> diff --git a/include/linux/iio/magnetometer/ak8975.h b/include/linux/iio/magnetometer/ak8975.h
> deleted file mode 100644
> index df3697183800..000000000000
> --- a/include/linux/iio/magnetometer/ak8975.h
> +++ /dev/null
> @@ -1,15 +0,0 @@
> -/* SPDX-License-Identifier: GPL-2.0 */
> -#ifndef __IIO_MAGNETOMETER_AK8975_H__
> -#define __IIO_MAGNETOMETER_AK8975_H__
> -
> -#include <linux/iio/iio.h>
> -
> -/**
> - * struct ak8975_platform_data - AK8975 magnetometer driver platform data
> - * @orientation: mounting matrix relative to main hardware
> - */
> -struct ak8975_platform_data {
> - struct iio_mount_matrix orientation;
> -};
> -
> -#endif
