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=-11.6 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_2 autolearn=unavailable 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 684F7C388F7 for ; Sat, 10 Oct 2020 22:51:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3678A2083B for ; Sat, 10 Oct 2020 22:51:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1602370315; bh=yqbHya5AzbPmZRg4XfaW3rvqiSj4EXVXjoskEJWuMvU=; h=Date:From:To:Cc:Subject:In-Reply-To:References:List-ID:From; b=b7gsCQi5k0977UPEy4dKebw2HEkNTQk7BT8au9GIIjqBqMQPLKpVE0CWpyHL49vKQ 1rUQPg3no84DZ6AwtOrjY384tY+pBenn4dFdnGV2hSOCTidljaMYrCxBTUpP3usQUv xaFr47GEgdRzt2B2ElbEL34hfCGHWTiVhuYsbI/g= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732895AbgJJWig (ORCPT ); Sat, 10 Oct 2020 18:38:36 -0400 Received: from mail.kernel.org ([198.145.29.99]:48338 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730439AbgJJS5V (ORCPT ); Sat, 10 Oct 2020 14:57:21 -0400 Received: from archlinux (cpc149474-cmbg20-2-0-cust94.5-4.cable.virginm.net [82.4.196.95]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 62E3F2064B; Sat, 10 Oct 2020 16:07:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1602346045; bh=yqbHya5AzbPmZRg4XfaW3rvqiSj4EXVXjoskEJWuMvU=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=BcF0zQDkAGm9Coi1aAVr+rHLbwd9umTY7wfJ3NuTStMHuDva8OF2RHoELbm/Q4pD2 Lk2Ce8sqYPC1OXoQZ+qgs/1tKmGcJvzCx2ZQN29bxAyJS7i5zxNzBC4hwxWK4eWnzO gf+07FdlYDMUUt+ZK10fcJlMinE3UvMTqmucK6ls= Date: Sat, 10 Oct 2020 17:07:20 +0100 From: Jonathan Cameron To: Alexandre Belloni Cc: Alexandru Ardelean , linux-iio@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.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: <20201010170720.29f192f8@archlinux> In-Reply-To: <20200930140555.GI2804081@piout.net> References: <20200930135048.11530-1-alexandru.ardelean@analog.com> <20200930135048.11530-5-alexandru.ardelean@analog.com> <20200930140555.GI2804081@piout.net> X-Mailer: Claws Mail 3.17.7 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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_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 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; > > + 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 > > > 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=-11.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_2 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 CBDDBC433E7 for ; Sat, 10 Oct 2020 16:08:45 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6F616223B0 for ; Sat, 10 Oct 2020 16:08:45 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="JDdUj6Oi"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="BcF0zQDk" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6F616223B0 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-ID: Subject:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=HvBPwzsRANbffnjPq7Cwbu5y7Wf6vEDYecxCXE65yr8=; b=JDdUj6OiPaGKfOl/E5FapWB5+ aOvHsb4sxXkf/G44qKpRDir/2XwQKqfoaqlWUCKWbmDwxb1YwsQnSWDqsQ2TVpKlrvo01hI+ZDX6/ 2MVhfDMXYXFIIrY9269VwaYD3bDo+rTVbXML8iiWuSRaVWDlAcItOJhvKcm2jgj22fiKDl6Hw9lbQ WoTdz6KfNYJ+UXc1OZcvOBztfrmnAWOx3kTQI1Fr3USWBjtCEZCAQIYrnscngGhk8ZqdshpNJEjzd ICpVMlSv9QOQcZQib7Qvfgau0fQBzu/OuN+1Kjz5QnrErieKlJNbQGTliuAOmBWWhp5g+SXKkiWK5 glW8FWQ4w==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kRHP6-0000or-Ow; Sat, 10 Oct 2020 16:07:28 +0000 Received: from mail.kernel.org ([198.145.29.99]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kRHP4-0000oR-Dh for linux-arm-kernel@lists.infradead.org; Sat, 10 Oct 2020 16:07:27 +0000 Received: from archlinux (cpc149474-cmbg20-2-0-cust94.5-4.cable.virginm.net [82.4.196.95]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 62E3F2064B; Sat, 10 Oct 2020 16:07:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1602346045; bh=yqbHya5AzbPmZRg4XfaW3rvqiSj4EXVXjoskEJWuMvU=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=BcF0zQDkAGm9Coi1aAVr+rHLbwd9umTY7wfJ3NuTStMHuDva8OF2RHoELbm/Q4pD2 Lk2Ce8sqYPC1OXoQZ+qgs/1tKmGcJvzCx2ZQN29bxAyJS7i5zxNzBC4hwxWK4eWnzO gf+07FdlYDMUUt+ZK10fcJlMinE3UvMTqmucK6ls= Date: Sat, 10 Oct 2020 17:07:20 +0100 From: Jonathan Cameron To: Alexandre Belloni Subject: Re: [PATCH v4 4/4] iio: adc: at91_adc: remove platform data and move defs in driver file Message-ID: <20201010170720.29f192f8@archlinux> In-Reply-To: <20200930140555.GI2804081@piout.net> References: <20200930135048.11530-1-alexandru.ardelean@analog.com> <20200930135048.11530-5-alexandru.ardelean@analog.com> <20200930140555.GI2804081@piout.net> X-Mailer: Claws Mail 3.17.7 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201010_120726_598922_D33C1DF0 X-CRM114-Status: GOOD ( 32.96 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org, ludovic.desroches@microchip.com, Alexandru Ardelean , linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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_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 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; > > + 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 > > > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel