From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.0 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CE1EEC4727E for ; Wed, 30 Sep 2020 14:06:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 82147206C3 for ; Wed, 30 Sep 2020 14:06:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729903AbgI3OGA (ORCPT ); Wed, 30 Sep 2020 10:06:00 -0400 Received: from relay9-d.mail.gandi.net ([217.70.183.199]:40431 "EHLO relay9-d.mail.gandi.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728149AbgI3OF7 (ORCPT ); Wed, 30 Sep 2020 10:05:59 -0400 X-Originating-IP: 90.65.88.165 Received: from localhost (lfbn-lyo-1-1908-165.w90-65.abo.wanadoo.fr [90.65.88.165]) (Authenticated sender: alexandre.belloni@bootlin.com) by relay9-d.mail.gandi.net (Postfix) with ESMTPSA id 3E34DFF802; Wed, 30 Sep 2020 14:05:56 +0000 (UTC) Date: Wed, 30 Sep 2020 16:05:55 +0200 From: Alexandre Belloni To: Alexandru Ardelean Cc: linux-iio@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, jic23@kernel.org, nicolas.ferre@microchip.com, ludovic.desroches@microchip.com Subject: Re: [PATCH v4 4/4] iio: adc: at91_adc: remove platform data and move defs in driver file Message-ID: <20200930140555.GI2804081@piout.net> References: <20200930135048.11530-1-alexandru.ardelean@analog.com> <20200930135048.11530-5-alexandru.ardelean@analog.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200930135048.11530-5-alexandru.ardelean@analog.com> Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org 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_SHTIM 0xa > #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; > + bool is_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(&pdev->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 = &st->caps->registers; > - st->touchscreen_type = pdata->touchscreen_type; > - > - return 0; > -} > - > static const struct iio_info at91_adc_info = { > .read_raw = &at91_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(&pdev->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..000000000000 > --- 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; > - bool is_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 ADC > - * @use_external_triggers: does the board has external triggers availables > - * @vref: Reference voltage for the ADC in millivolts > - * @touchscreen_type: If a touchscreen is connected, its type (4 or 5 wires) > - */ > -struct at91_adc_data { > - unsigned long channels_used; > - u8 startup_time; > - struct at91_adc_trigger *trigger_list; > - u8 trigger_number; > - bool use_external_triggers; > - u16 vref; > - enum atmel_adc_ts_type touchscreen_type; > -}; > - > -extern void __init at91_add_device_adc(struct at91_adc_data *data); > -#endif > -- > 2.17.1 > -- Alexandre Belloni, Bootlin Embedded Linux and Kernel engineering https://bootlin.com