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=-15.9 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, 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 B7C6EC433EF for ; Sun, 5 Sep 2021 14:32:09 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 7F21160F21 for ; Sun, 5 Sep 2021 14:32:09 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 7F21160F21 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Subject:Cc: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=3Pj2wZQpjWdnjE6moSligiCVDhpvPQQhGu2cB406ZEU=; b=oYpbxSON6S7SoM AhH/Udh3+CFaJ4JVmTOlZdU+5dbfZyVK8YAmib04sFuGfOL5r02B3yPb1xy43hUvTfgR2YmVxSK4o muXtM/p1HX0vxaXNlJgQladrCEVSXSEaUjZtnRb5CE3SMSNgHWM5NJcBLcXmPUFPcQH99oRDi0U5Y nVTmkazUSSGc6ZkEkRP8DmlvqE7QOCmMi271syJ5S+5VWfEH+Rvj87fvpPBF+VLmFmSGnK0pXbhFu w+8/GvMLISlQeXAy80k7CBTjvx0EfLkr1SvPuEEFaAmgaLxFp4vubahq9qjFgTGV0ia0qMKkWMRQt iJtIa0WOdTCF8/7IEKkw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mMtAA-00Fx9t-JC; Sun, 05 Sep 2021 14:30:26 +0000 Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mMtA7-00Fx9H-7b for linux-arm-kernel@lists.infradead.org; Sun, 05 Sep 2021 14:30:24 +0000 Received: from jic23-huawei (cpc108967-cmbg20-2-0-cust86.5-4.cable.virginm.net [81.101.6.87]) (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 78F3F60F21; Sun, 5 Sep 2021 14:30:17 +0000 (UTC) Date: Sun, 5 Sep 2021 15:33:39 +0100 From: Jonathan Cameron To: Billy Tsai Cc: , , , , , , , , , , , , , Subject: Re: [v5 04/15] iio: adc: aspeed: Keep model data to driver data. Message-ID: <20210905153339.751732cc@jic23-huawei> In-Reply-To: <20210831071458.2334-5-billy_tsai@aspeedtech.com> References: <20210831071458.2334-1-billy_tsai@aspeedtech.com> <20210831071458.2334-5-billy_tsai@aspeedtech.com> X-Mailer: Claws Mail 4.0.0 (GTK+ 3.24.30; 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-20210905_073023_359879_99CDCEE1 X-CRM114-Status: GOOD ( 22.53 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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 Tue, 31 Aug 2021 15:14:47 +0800 Billy Tsai wrote: > Keep the model data pointer to driver data for reducing the usage of > of_device_get_match_data(). > > Signed-off-by: Billy Tsai This one starts to be impacted by the fix (as its in the context). Rather than making a mess of things for linux-next etc I'll hold off on these until that fix is upstream in a few weeks. If I seem to have lost it (it's been known to happen :( ) then feel free to poke me! Thanks, Jonathan > --- > drivers/iio/adc/aspeed_adc.c | 20 +++++++------------- > 1 file changed, 7 insertions(+), 13 deletions(-) > > diff --git a/drivers/iio/adc/aspeed_adc.c b/drivers/iio/adc/aspeed_adc.c > index f055fe7b2c40..76ae1c3f584b 100644 > --- a/drivers/iio/adc/aspeed_adc.c > +++ b/drivers/iio/adc/aspeed_adc.c > @@ -77,6 +77,7 @@ struct aspeed_adc_model_data { > > struct aspeed_adc_data { > struct device *dev; > + const struct aspeed_adc_model_data *model_data; > void __iomem *base; > spinlock_t clk_lock; > struct clk_hw *clk_prescaler; > @@ -118,8 +119,6 @@ static int aspeed_adc_read_raw(struct iio_dev *indio_dev, > int *val, int *val2, long mask) > { > struct aspeed_adc_data *data = iio_priv(indio_dev); > - const struct aspeed_adc_model_data *model_data = > - of_device_get_match_data(data->dev); > > switch (mask) { > case IIO_CHAN_INFO_RAW: > @@ -127,7 +126,7 @@ static int aspeed_adc_read_raw(struct iio_dev *indio_dev, > return IIO_VAL_INT; > > case IIO_CHAN_INFO_SCALE: > - *val = model_data->vref_voltage; > + *val = data->model_data->vref_voltage; > *val2 = ASPEED_RESOLUTION_BITS; > return IIO_VAL_FRACTIONAL_LOG2; > > @@ -146,13 +145,11 @@ static int aspeed_adc_write_raw(struct iio_dev *indio_dev, > int val, int val2, long mask) > { > struct aspeed_adc_data *data = iio_priv(indio_dev); > - const struct aspeed_adc_model_data *model_data = > - of_device_get_match_data(data->dev); > > switch (mask) { > case IIO_CHAN_INFO_SAMP_FREQ: > - if (val < model_data->min_sampling_rate || > - val > model_data->max_sampling_rate) > + if (val < data->model_data->min_sampling_rate || > + val > data->model_data->max_sampling_rate) > return -EINVAL; > > clk_set_rate(data->clk_scaler->clk, > @@ -198,7 +195,6 @@ static int aspeed_adc_probe(struct platform_device *pdev) > { > struct iio_dev *indio_dev; > struct aspeed_adc_data *data; > - const struct aspeed_adc_model_data *model_data; > const char *clk_parent_name; > int ret; > u32 adc_engine_control_reg_val; > @@ -209,6 +205,7 @@ static int aspeed_adc_probe(struct platform_device *pdev) > > data = iio_priv(indio_dev); > data->dev = &pdev->dev; > + data->model_data = of_device_get_match_data(&pdev->dev); > platform_set_drvdata(pdev, indio_dev); > > data->base = devm_platform_ioremap_resource(pdev, 0); > @@ -249,9 +246,7 @@ static int aspeed_adc_probe(struct platform_device *pdev) > } > reset_control_deassert(data->rst); > > - model_data = of_device_get_match_data(&pdev->dev); > - > - if (model_data->wait_init_sequence) { > + if (data->model_data->wait_init_sequence) { > /* Enable engine in normal mode. */ > writel(FIELD_PREP(ASPEED_ADC_OP_MODE, > ASPEED_ADC_OP_MODE_NORMAL) | > @@ -281,8 +276,7 @@ static int aspeed_adc_probe(struct platform_device *pdev) > writel(adc_engine_control_reg_val, > data->base + ASPEED_REG_ENGINE_CONTROL); > > - model_data = of_device_get_match_data(&pdev->dev); > - indio_dev->name = model_data->model_name; > + indio_dev->name = data->model_data->model_name; > indio_dev->info = &aspeed_adc_iio_info; > indio_dev->modes = INDIO_DIRECT_MODE; > indio_dev->channels = aspeed_adc_iio_channels; _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel