From patchwork Wed Apr 6 05:15:55 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alison Schofield X-Patchwork-Id: 8758091 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id CF0929F372 for ; Wed, 6 Apr 2016 05:16:22 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CD4D4202FF for ; Wed, 6 Apr 2016 05:16:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E8034202FE for ; Wed, 6 Apr 2016 05:16:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761026AbcDFFP7 (ORCPT ); Wed, 6 Apr 2016 01:15:59 -0400 Received: from mail-pa0-f67.google.com ([209.85.220.67]:36762 "EHLO mail-pa0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1761021AbcDFFP5 (ORCPT ); Wed, 6 Apr 2016 01:15:57 -0400 Received: by mail-pa0-f67.google.com with SMTP id 1so3070798pal.3; Tue, 05 Apr 2016 22:15:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=UqSZ5rpXtW9MH5blKpfD7wNIz1wbvuswKjKo3F3uGC0=; b=rBq79au4UzA1NR3rha3flbdos04ZORf33VaX/0s6tm9dK2gm2dkNG11rtSgD4uVNsx z2HmqCGLQc49R81mFjPSM+HNuFUDy3p0Biaj1iDXsks+haYvAfp6Z1l9FMSO4NM1YG0O Hqp2YWjQdS/e9QQBwb8LAE7cG8knYQgHAPjSj5OEdaNCpfrMqLYOLrckWn1mcfr/VgQI l058CGxX5LMPVLCsGV8Le0vSzuDwL4eFXt2WgKSba5tPkNMxnQyKQhQRE9xUKZU2taDM G7y5ejiBh4s1QHWqPx82MJ5RE6Hvi97IaAK7OebQEO1Ah3qr8WsdUYE9DsyWulcILkec 3Sag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=UqSZ5rpXtW9MH5blKpfD7wNIz1wbvuswKjKo3F3uGC0=; b=fLhNPJNRkY8MwFZ71iY+nUGqQzzwC/wMhbkbQvTL09C1uQqyzWVRPmDrjaQNTLfgzr KPXb3yJRFrmbAA43R5AM2fa2hkEpDlTUgmZyqF4hbbrhqtVlp0ckID0FX7Y83KTnpyLE lSg6tkH8Ql1VTp+xxS2mYOb/gFwv8pWfD/ZgYBK5pyy+HjxrzQCGj08BDs4X3XNr4oQH AFmUqN32UPpr9pmhrVI6qo7JdqBo6PRqaEtTCO5H8g0uTtrPRkeNlcEyEepIJiWQmRrV LpQdLneHqKmWUuHQcfYq2pXC2uVy0SNPFjJMMzJvCLSWKr4fXKmCpD6oKAiZ2Mn46cZx FW0Q== X-Gm-Message-State: AD7BkJJz+Tuyy3D7tmT6kFhwWFSy+szr6CLdjyyk+Ava6DhDA/BzDePNpc3oTBQfrOyV0g== X-Received: by 10.66.148.232 with SMTP id tv8mr67712729pab.21.1459919756873; Tue, 05 Apr 2016 22:15:56 -0700 (PDT) Received: from d830 (or-67-232-74-92.dhcp.embarqhsd.net. [67.232.74.92]) by smtp.gmail.com with ESMTPSA id v9sm1332738pfi.50.2016.04.05.22.15.56 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 05 Apr 2016 22:15:56 -0700 (PDT) Date: Tue, 5 Apr 2016 22:15:55 -0700 From: Alison Schofield To: jic23@kernel.org Cc: knaack.h@gmx.de, lars@metafoo.de, pmeerw@pmeerw.net, kgene@kernel.org, k.kozlowski@samsung.com, linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org Subject: [PATCH 1/9] iio: adc: exynos_adc: use regmap to retrieve struct device Message-ID: <2329d20396db00b60f4e7d2e783ea46b48eea9c1.1459918214.git.amsfield22@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Spam-Status: No, score=-7.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Driver includes struct regmap and struct device in its global data. Remove the struct device and use regmap API to retrieve device info. Patch created using Coccinelle plus manual edits. Signed-off-by: Alison Schofield --- drivers/iio/adc/exynos_adc.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/iio/adc/exynos_adc.c b/drivers/iio/adc/exynos_adc.c index c15756d..0313e0f 100644 --- a/drivers/iio/adc/exynos_adc.c +++ b/drivers/iio/adc/exynos_adc.c @@ -130,7 +130,6 @@ struct exynos_adc { struct exynos_adc_data *data; - struct device *dev; struct input_dev *input; void __iomem *regs; struct regmap *pmu_map; @@ -173,11 +172,12 @@ static void exynos_adc_unprepare_clk(struct exynos_adc *info) static int exynos_adc_prepare_clk(struct exynos_adc *info) { + struct device *dev = regmap_get_device(info->pmu_map); int ret; ret = clk_prepare(info->clk); if (ret) { - dev_err(info->dev, "failed preparing adc clock: %d\n", ret); + dev_err(dev, "failed preparing adc clock: %d\n", ret); return ret; } @@ -185,7 +185,7 @@ static int exynos_adc_prepare_clk(struct exynos_adc *info) ret = clk_prepare(info->sclk); if (ret) { clk_unprepare(info->clk); - dev_err(info->dev, + dev_err(dev, "failed preparing sclk_adc clock: %d\n", ret); return ret; } @@ -203,11 +203,12 @@ static void exynos_adc_disable_clk(struct exynos_adc *info) static int exynos_adc_enable_clk(struct exynos_adc *info) { + struct device *dev = regmap_get_device(info->pmu_map); int ret; ret = clk_enable(info->clk); if (ret) { - dev_err(info->dev, "failed enabling adc clock: %d\n", ret); + dev_err(dev, "failed enabling adc clock: %d\n", ret); return ret; } @@ -215,7 +216,7 @@ static int exynos_adc_enable_clk(struct exynos_adc *info) ret = clk_enable(info->sclk); if (ret) { clk_disable(info->clk); - dev_err(info->dev, + dev_err(dev, "failed enabling sclk_adc clock: %d\n", ret); return ret; } @@ -610,13 +611,14 @@ static irqreturn_t exynos_adc_isr(int irq, void *dev_id) static irqreturn_t exynos_ts_isr(int irq, void *dev_id) { struct exynos_adc *info = dev_id; - struct iio_dev *dev = dev_get_drvdata(info->dev); + struct device *dev = regmap_get_device(info->pmu_map); + struct iio_dev *indio_dev = dev_get_drvdata(dev); u32 x, y; bool pressed; int ret; while (info->input->users) { - ret = exynos_read_s3c64xx_ts(dev, &x, &y); + ret = exynos_read_s3c64xx_ts(indio_dev, &x, &y); if (ret == -ETIMEDOUT) break; @@ -800,8 +802,6 @@ static int exynos_adc_probe(struct platform_device *pdev) info->tsirq = irq; - info->dev = &pdev->dev; - init_completion(&info->completion); info->clk = devm_clk_get(&pdev->dev, "adc");