Re: [PATCH v4 4/4] iio: adc: at91_adc: remove platform data and move defs in driver file
On Wed, 30 Sep 2020 16:05:55 +0200
Alexandre Belloni wrote:
> On 30/09/2020 16:50:48+0300, Alexandru Ardelean wrote:
> > The AT91 ADC driver no longer uses the 'at91_add_device_adc' platform data
> > type. This is no longer used (at least in mainline boards).
> >
> > This change removes the platform-data initialization from the driver, since
> > it is mostly dead code now.
> >
> > Some definitions [from the platform data at91_adc.h include] have been
> > moved in the driver, since they are needed in the driver.
> >
> > Signed-off-by: Alexandru Ardelean
> Reviewed-by: Alexandre Belloni
>
> > ---
> > drivers/iio/adc/at91_adc.c | 60 ++
> > include/linux/platform_data/at91_adc.h | 49 -
> > 2 files changed, 22 insertions(+), 87 deletions(-)
> > delete mode 100644 include/linux/platform_data/at91_adc.h
> >
> > diff --git a/drivers/iio/adc/at91_adc.c b/drivers/iio/adc/at91_adc.c
> > index 473bffe84fbd..be6abf739881 100644
> > --- a/drivers/iio/adc/at91_adc.c
> > +++ b/drivers/iio/adc/at91_adc.c
> > @@ -22,8 +22,6 @@
> > #include
> > #include
> >
> > -#include
> > -
> > #include
> > #include
> > #include
> > @@ -153,6 +151,25 @@
> > #define TOUCH_SHTIM0xa
> > #define TOUCH_SCTIM_US 10 /* 10us for the
> > Touchscreen Switches Closure Time */
> >
> > +enum atmel_adc_ts_type {
> > + ATMEL_ADC_TOUCHSCREEN_NONE = 0,
> > + ATMEL_ADC_TOUCHSCREEN_4WIRE = 4,
> > + ATMEL_ADC_TOUCHSCREEN_5WIRE = 5,
> > +};
> > +
> > +/**
> > + * struct at91_adc_trigger - description of triggers
> > + * @name: name of the trigger advertised to the user
> > + * @value: value to set in the ADC's trigger setup register
> > + to enable the trigger
Build with W=1 (and hence kernel doc checks) picked up missing *
on this line.
Fixed.
Jonathan
> > + * @is_external: Does the trigger rely on an external pin?
> > + */
> > +struct at91_adc_trigger {
> > + const char *name;
> > + u8 value;
> > + boolis_external;
> > +};
> > +
> > /**
> > * struct at91_adc_reg_desc - Various informations relative to registers
> > * @channel_base: Base offset for the channel data registers
> > @@ -873,9 +890,6 @@ static int at91_adc_probe_dt(struct iio_dev *idev,
> > int i = 0, ret;
> > u32 prop;
> >
> > - if (!node)
> > - return -EINVAL;
> > -
> > st->caps = of_device_get_match_data(>dev);
> >
> > st->use_external = of_property_read_bool(node,
> > "atmel,adc-use-external-triggers");
> > @@ -957,30 +971,6 @@ static int at91_adc_probe_dt(struct iio_dev *idev,
> > return ret;
> > }
> >
> > -static int at91_adc_probe_pdata(struct at91_adc_state *st,
> > - struct platform_device *pdev)
> > -{
> > - struct at91_adc_data *pdata = pdev->dev.platform_data;
> > -
> > - if (!pdata)
> > - return -EINVAL;
> > -
> > - st->caps = (struct at91_adc_caps *)
> > - platform_get_device_id(pdev)->driver_data;
> > -
> > - st->use_external = pdata->use_external_triggers;
> > - st->vref_mv = pdata->vref;
> > - st->channels_mask = pdata->channels_used;
> > - st->num_channels = st->caps->num_channels;
> > - st->startup_time = pdata->startup_time;
> > - st->trigger_number = pdata->trigger_number;
> > - st->trigger_list = pdata->trigger_list;
> > - st->registers = >caps->registers;
> > - st->touchscreen_type = pdata->touchscreen_type;
> > -
> > - return 0;
> > -}
> > -
> > static const struct iio_info at91_adc_info = {
> > .read_raw = _adc_read_raw,
> > };
> > @@ -1157,15 +1147,9 @@ static int at91_adc_probe(struct platform_device
> > *pdev)
> >
> > st = iio_priv(idev);
> >
> > - if (pdev->dev.of_node)
> > - ret = at91_adc_probe_dt(idev, pdev);
> > - else
> > - ret = at91_adc_probe_pdata(st, pdev);
> > -
> > - if (ret) {
> > - dev_err(>dev, "No platform data available.\n");
> > - return -EINVAL;
> > - }
> > + ret = at91_adc_probe_dt(idev, pdev);
> > + if (ret)
> > + return ret;
> >
> > platform_set_drvdata(pdev, idev);
> >
> > diff --git a/include/linux/platform_data/at91_adc.h
> > b/include/linux/platform_data/at91_adc.h
> > deleted file mode 100644
> > index f20eaeb827ce..
> > --- a/include/linux/platform_data/at91_adc.h
> > +++ /dev/null
> > @@ -1,49 +0,0 @@
> > -/* SPDX-License-Identifier: GPL-2.0-or-later */
> > -/*
> > - * Copyright (C) 2011 Free Electrons
> > - */
> > -
> > -#ifndef _AT91_ADC_H_
> > -#define _AT91_ADC_H_
> > -
> > -enum atmel_adc_ts_type {
> > - ATMEL_ADC_TOUCHSCREEN_NONE = 0,
> > - ATMEL_ADC_TOUCHSCREEN_4WIRE = 4,
> > - ATMEL_ADC_TOUCHSCREEN_5WIRE = 5,
> > -};
> > -
> > -/**
> > - * struct at91_adc_trigger - description of triggers
> > - * @name: name of the trigger advertised to the user
> > - * @value: value to set in
Re: [PATCH v4 4/4] iio: adc: at91_adc: remove platform data and move defs in driver file
On 30/09/2020 16:50:48+0300, Alexandru Ardelean wrote:
> The AT91 ADC driver no longer uses the 'at91_add_device_adc' platform data
> type. This is no longer used (at least in mainline boards).
>
> This change removes the platform-data initialization from the driver, since
> it is mostly dead code now.
>
> Some definitions [from the platform data at91_adc.h include] have been
> moved in the driver, since they are needed in the driver.
>
> Signed-off-by: Alexandru Ardelean
Reviewed-by: Alexandre Belloni
> ---
> drivers/iio/adc/at91_adc.c | 60 ++
> include/linux/platform_data/at91_adc.h | 49 -
> 2 files changed, 22 insertions(+), 87 deletions(-)
> delete mode 100644 include/linux/platform_data/at91_adc.h
>
> diff --git a/drivers/iio/adc/at91_adc.c b/drivers/iio/adc/at91_adc.c
> index 473bffe84fbd..be6abf739881 100644
> --- a/drivers/iio/adc/at91_adc.c
> +++ b/drivers/iio/adc/at91_adc.c
> @@ -22,8 +22,6 @@
> #include
> #include
>
> -#include
> -
> #include
> #include
> #include
> @@ -153,6 +151,25 @@
> #define TOUCH_SHTIM0xa
> #define TOUCH_SCTIM_US 10 /* 10us for the
> Touchscreen Switches Closure Time */
>
> +enum atmel_adc_ts_type {
> + ATMEL_ADC_TOUCHSCREEN_NONE = 0,
> + ATMEL_ADC_TOUCHSCREEN_4WIRE = 4,
> + ATMEL_ADC_TOUCHSCREEN_5WIRE = 5,
> +};
> +
> +/**
> + * struct at91_adc_trigger - description of triggers
> + * @name:name of the trigger advertised to the user
> + * @value: value to set in the ADC's trigger setup register
> + to enable the trigger
> + * @is_external: Does the trigger rely on an external pin?
> + */
> +struct at91_adc_trigger {
> + const char *name;
> + u8 value;
> + boolis_external;
> +};
> +
> /**
> * struct at91_adc_reg_desc - Various informations relative to registers
> * @channel_base:Base offset for the channel data registers
> @@ -873,9 +890,6 @@ static int at91_adc_probe_dt(struct iio_dev *idev,
> int i = 0, ret;
> u32 prop;
>
> - if (!node)
> - return -EINVAL;
> -
> st->caps = of_device_get_match_data(>dev);
>
> st->use_external = of_property_read_bool(node,
> "atmel,adc-use-external-triggers");
> @@ -957,30 +971,6 @@ static int at91_adc_probe_dt(struct iio_dev *idev,
> return ret;
> }
>
> -static int at91_adc_probe_pdata(struct at91_adc_state *st,
> - struct platform_device *pdev)
> -{
> - struct at91_adc_data *pdata = pdev->dev.platform_data;
> -
> - if (!pdata)
> - return -EINVAL;
> -
> - st->caps = (struct at91_adc_caps *)
> - platform_get_device_id(pdev)->driver_data;
> -
> - st->use_external = pdata->use_external_triggers;
> - st->vref_mv = pdata->vref;
> - st->channels_mask = pdata->channels_used;
> - st->num_channels = st->caps->num_channels;
> - st->startup_time = pdata->startup_time;
> - st->trigger_number = pdata->trigger_number;
> - st->trigger_list = pdata->trigger_list;
> - st->registers = >caps->registers;
> - st->touchscreen_type = pdata->touchscreen_type;
> -
> - return 0;
> -}
> -
> static const struct iio_info at91_adc_info = {
> .read_raw = _adc_read_raw,
> };
> @@ -1157,15 +1147,9 @@ static int at91_adc_probe(struct platform_device *pdev)
>
> st = iio_priv(idev);
>
> - if (pdev->dev.of_node)
> - ret = at91_adc_probe_dt(idev, pdev);
> - else
> - ret = at91_adc_probe_pdata(st, pdev);
> -
> - if (ret) {
> - dev_err(>dev, "No platform data available.\n");
> - return -EINVAL;
> - }
> + ret = at91_adc_probe_dt(idev, pdev);
> + if (ret)
> + return ret;
>
> platform_set_drvdata(pdev, idev);
>
> diff --git a/include/linux/platform_data/at91_adc.h
> b/include/linux/platform_data/at91_adc.h
> deleted file mode 100644
> index f20eaeb827ce..
> --- a/include/linux/platform_data/at91_adc.h
> +++ /dev/null
> @@ -1,49 +0,0 @@
> -/* SPDX-License-Identifier: GPL-2.0-or-later */
> -/*
> - * Copyright (C) 2011 Free Electrons
> - */
> -
> -#ifndef _AT91_ADC_H_
> -#define _AT91_ADC_H_
> -
> -enum atmel_adc_ts_type {
> - ATMEL_ADC_TOUCHSCREEN_NONE = 0,
> - ATMEL_ADC_TOUCHSCREEN_4WIRE = 4,
> - ATMEL_ADC_TOUCHSCREEN_5WIRE = 5,
> -};
> -
> -/**
> - * struct at91_adc_trigger - description of triggers
> - * @name:name of the trigger advertised to the user
> - * @value: value to set in the ADC's trigger setup register
> - to enable the trigger
> - * @is_external: Does the trigger rely on an external pin?
> - */
> -struct at91_adc_trigger {
> - const char *name;
> - u8 value;
> - boolis_external;
> -};
> -
> -/**
> - * struct at91_adc_data - platform data for ADC
[PATCH v4 4/4] iio: adc: at91_adc: remove platform data and move defs in driver file
The AT91 ADC driver no longer uses the 'at91_add_device_adc' platform data
type. This is no longer used (at least in mainline boards).
This change removes the platform-data initialization from the driver, since
it is mostly dead code now.
Some definitions [from the platform data at91_adc.h include] have been
moved in the driver, since they are needed in the driver.
Signed-off-by: Alexandru Ardelean
---
drivers/iio/adc/at91_adc.c | 60 ++
include/linux/platform_data/at91_adc.h | 49 -
2 files changed, 22 insertions(+), 87 deletions(-)
delete mode 100644 include/linux/platform_data/at91_adc.h
diff --git a/drivers/iio/adc/at91_adc.c b/drivers/iio/adc/at91_adc.c
index 473bffe84fbd..be6abf739881 100644
--- a/drivers/iio/adc/at91_adc.c
+++ b/drivers/iio/adc/at91_adc.c
@@ -22,8 +22,6 @@
#include
#include
-#include
-
#include
#include
#include
@@ -153,6 +151,25 @@
#define TOUCH_SHTIM0xa
#define TOUCH_SCTIM_US 10 /* 10us for the Touchscreen
Switches Closure Time */
+enum atmel_adc_ts_type {
+ ATMEL_ADC_TOUCHSCREEN_NONE = 0,
+ ATMEL_ADC_TOUCHSCREEN_4WIRE = 4,
+ ATMEL_ADC_TOUCHSCREEN_5WIRE = 5,
+};
+
+/**
+ * struct at91_adc_trigger - description of triggers
+ * @name: name of the trigger advertised to the user
+ * @value: value to set in the ADC's trigger setup register
+ to enable the trigger
+ * @is_external: Does the trigger rely on an external pin?
+ */
+struct at91_adc_trigger {
+ const char *name;
+ u8 value;
+ boolis_external;
+};
+
/**
* struct at91_adc_reg_desc - Various informations relative to registers
* @channel_base: Base offset for the channel data registers
@@ -873,9 +890,6 @@ static int at91_adc_probe_dt(struct iio_dev *idev,
int i = 0, ret;
u32 prop;
- if (!node)
- return -EINVAL;
-
st->caps = of_device_get_match_data(>dev);
st->use_external = of_property_read_bool(node,
"atmel,adc-use-external-triggers");
@@ -957,30 +971,6 @@ static int at91_adc_probe_dt(struct iio_dev *idev,
return ret;
}
-static int at91_adc_probe_pdata(struct at91_adc_state *st,
- struct platform_device *pdev)
-{
- struct at91_adc_data *pdata = pdev->dev.platform_data;
-
- if (!pdata)
- return -EINVAL;
-
- st->caps = (struct at91_adc_caps *)
- platform_get_device_id(pdev)->driver_data;
-
- st->use_external = pdata->use_external_triggers;
- st->vref_mv = pdata->vref;
- st->channels_mask = pdata->channels_used;
- st->num_channels = st->caps->num_channels;
- st->startup_time = pdata->startup_time;
- st->trigger_number = pdata->trigger_number;
- st->trigger_list = pdata->trigger_list;
- st->registers = >caps->registers;
- st->touchscreen_type = pdata->touchscreen_type;
-
- return 0;
-}
-
static const struct iio_info at91_adc_info = {
.read_raw = _adc_read_raw,
};
@@ -1157,15 +1147,9 @@ static int at91_adc_probe(struct platform_device *pdev)
st = iio_priv(idev);
- if (pdev->dev.of_node)
- ret = at91_adc_probe_dt(idev, pdev);
- else
- ret = at91_adc_probe_pdata(st, pdev);
-
- if (ret) {
- dev_err(>dev, "No platform data available.\n");
- return -EINVAL;
- }
+ ret = at91_adc_probe_dt(idev, pdev);
+ if (ret)
+ return ret;
platform_set_drvdata(pdev, idev);
diff --git a/include/linux/platform_data/at91_adc.h
b/include/linux/platform_data/at91_adc.h
deleted file mode 100644
index f20eaeb827ce..
--- a/include/linux/platform_data/at91_adc.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-/*
- * Copyright (C) 2011 Free Electrons
- */
-
-#ifndef _AT91_ADC_H_
-#define _AT91_ADC_H_
-
-enum atmel_adc_ts_type {
- ATMEL_ADC_TOUCHSCREEN_NONE = 0,
- ATMEL_ADC_TOUCHSCREEN_4WIRE = 4,
- ATMEL_ADC_TOUCHSCREEN_5WIRE = 5,
-};
-
-/**
- * struct at91_adc_trigger - description of triggers
- * @name: name of the trigger advertised to the user
- * @value: value to set in the ADC's trigger setup register
- to enable the trigger
- * @is_external: Does the trigger rely on an external pin?
- */
-struct at91_adc_trigger {
- const char *name;
- u8 value;
- boolis_external;
-};
-
-/**
- * struct at91_adc_data - platform data for ADC driver
- * @channels_used: channels in use on the board as a bitmask
- * @startup_time: startup time of the ADC in microseconds
- * @trigger_list: Triggers available in the ADC
- * @trigger_number:Number of triggers available in the
