From patchwork Mon Dec 4 14:12:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quentin Schulz X-Patchwork-Id: 10090535 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id B81D16056E for ; Mon, 4 Dec 2017 14:36:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 651A528CF3 for ; Mon, 4 Dec 2017 14:36:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5956428D69; Mon, 4 Dec 2017 14:36:10 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id DCD7928CF3 for ; Mon, 4 Dec 2017 14:36:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=ehbz3n35aMlpyoIism+Pz4b6NrxPxOEaOXOo4wMIKL0=; b=ScQaWhC+vkstEoZIFptL4Q5852 Do0T2Pb85y+HEFEVzdv46/Yr1e9Fj1jYfT6UcZXNxpwH5PlVs/xVWWiGonGNJFwp4MI/DmP32pM2u l+0pJzu5mmelxK3FOgTeSu3dLELD2Gv59xcLJ/lqArpK1FnEG1ch1h4VuksZnLxywex2xIJJbjMBA Go9qb8MLrs7OMxkbeq3UTB9E4/w9dlT6a/q02scPd6BHBhsos63qqPiv6zJBb7AWvzkQGLEGnpDUk xiaTKK95DawF9XZqW55MwvpTAW3w4mdAaWFAvX5px2YneEqmlSTNw8/WmICMfgIp3l4wtnplul3Yz vdc8+RGw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1eLrqo-0000Hr-OD; Mon, 04 Dec 2017 14:36:06 +0000 Received: from merlin.infradead.org ([2001:8b0:10b:1231::1]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1eLrpN-0005oP-Mu for linux-arm-kernel@bombadil.infradead.org; Mon, 04 Dec 2017 14:34:37 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=ZhB2+15oIvyjMK5UDwSp/ew6R9DttcCjncxj6ZObM0s=; b=bldczBVsUKAJVXqCC8Zz5n9qq gZjOAlBdvz4tWPjQZCJuANqk3WRhOBcAqmOXTexBQPfMOWjgzMRPbi/fM+oYGiEfbkDbp5d+9qxAO CEdUrn7H3x9i1lHL/hdzEfXbMzDDGKJ90Bfw8lMvQi2q5j/ddotWQcKVpo4ZogLKrcMludKHDZaQJ mwX7oHOyU+C+RJxWnyR60y61ynGl3LSyv5ylZFnFcUuootuXHeYlyTsITR0/xTU4h5DXAhGS15xzr ZcOrFQOe43EPiX4o7VCBbEzsS5np7lQ6usybKd5xlexu3i5I2DPq46dr+hdOkgeWEwxvIh8SOPFiP QyelRBOZg==; Received: from mail.free-electrons.com ([62.4.15.54]) by merlin.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1eLrWl-0001Qq-8Q for linux-arm-kernel@lists.infradead.org; Mon, 04 Dec 2017 14:15:24 +0000 Received: by mail.free-electrons.com (Postfix, from userid 110) id ABF9820744; Mon, 4 Dec 2017 15:15:00 +0100 (CET) Received: from localhost.localdomain (LStLambert-657-1-97-87.w90-63.abo.wanadoo.fr [90.63.216.87]) by mail.free-electrons.com (Postfix) with ESMTPSA id 37C7D20976; Mon, 4 Dec 2017 15:14:50 +0100 (CET) From: Quentin Schulz To: sre@kernel.org, robh+dt@kernel.org, mark.rutland@arm.com, wens@csie.org, linux@armlinux.org.uk, maxime.ripard@free-electrons.com, jic23@kernel.org, lee.jones@linaro.org Subject: [PATCH 1/8] iio: adc: axp20x_adc: put ADC rate setting in a per-variant function Date: Mon, 4 Dec 2017 15:12:47 +0100 Message-Id: X-Mailer: git-send-email 2.14.1 In-Reply-To: References: In-Reply-To: References: X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: thomas.petazzoni@free-electrons.com, devicetree@vger.kernel.org, lars@metafoo.de, linux-pm@vger.kernel.org, linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org, Quentin Schulz , linux-sunxi@googlegroups.com, pmeerw@pmeerw.net, knaack.h@gmx.de, linux-arm-kernel@lists.infradead.org, icenowy@aosc.io MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP To prepare for a new comer that set a different register with different values, move rate setting in a function that is specific to each AXP variant. Signed-off-by: Quentin Schulz Acked-by: Jonathan Cameron --- drivers/iio/adc/axp20x_adc.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/drivers/iio/adc/axp20x_adc.c b/drivers/iio/adc/axp20x_adc.c index a30a972..7274f4f 100644 --- a/drivers/iio/adc/axp20x_adc.c +++ b/drivers/iio/adc/axp20x_adc.c @@ -470,14 +470,18 @@ static const struct iio_info axp22x_adc_iio_info = { .read_raw = axp22x_read_raw, }; -static int axp20x_adc_rate(int rate) +static int axp20x_adc_rate(struct axp20x_adc_iio *info, int rate) { - return AXP20X_ADC_RATE_HZ(rate); + return regmap_update_bits(info->regmap, AXP20X_ADC_RATE, + AXP20X_ADC_RATE_MASK, + AXP20X_ADC_RATE_HZ(rate)); } -static int axp22x_adc_rate(int rate) +static int axp22x_adc_rate(struct axp20x_adc_iio *info, int rate) { - return AXP22X_ADC_RATE_HZ(rate); + return regmap_update_bits(info->regmap, AXP20X_ADC_RATE, + AXP20X_ADC_RATE_MASK, + AXP22X_ADC_RATE_HZ(rate)); } struct axp_data { @@ -485,7 +489,7 @@ struct axp_data { int num_channels; struct iio_chan_spec const *channels; unsigned long adc_en1_mask; - int (*adc_rate)(int rate); + int (*adc_rate)(struct axp20x_adc_iio *info, int rate); bool adc_en2; struct iio_map *maps; }; @@ -554,8 +558,7 @@ static int axp20x_probe(struct platform_device *pdev) AXP20X_ADC_EN2_MASK, AXP20X_ADC_EN2_MASK); /* Configure ADCs rate */ - regmap_update_bits(info->regmap, AXP20X_ADC_RATE, AXP20X_ADC_RATE_MASK, - info->data->adc_rate(100)); + info->data->adc_rate(info, 100); ret = iio_map_array_register(indio_dev, info->data->maps); if (ret < 0) {