From patchwork Wed Jul 8 12:26:29 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vaibhav Hiremath X-Patchwork-Id: 50873 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f71.google.com (mail-la0-f71.google.com [209.85.215.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 72AE622A10 for ; Wed, 8 Jul 2015 12:30:05 +0000 (UTC) Received: by laar3 with SMTP id r3sf66378326laa.1 for ; Wed, 08 Jul 2015 05:30:04 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=le2+FAlYoU3zj+XIe17hfjqHhPZj5eLJDRnvw5NafEM=; b=Jv7ezCtzc0rl4frYNGzIE8Z6TInRZ7dmOSqzN/VxcOcy8N7aEFH6pWnGneNYRpNVuA 9L7RIelVc0DVHXokrzQoB4wB/MjpRVICqeqZG7etoQg/SgBlN/BHCpuQgVlx0lWNr41M 0A1mYVCH4gE3A7O05WT0lucj8/nByRu/lbx+HEyf2mJYJDs2btll5BpGwX7Nr4cssVmA oXrO/3u5VOLA13MJKsLWjnn9b25mV9XDEB85xa4Yfiw9o1z9mVDQhHLb0LA76GsKV7r7 Eg9KUCEBe4nJRK7x7gZ6/qxZyWlEjBHxWop/I4MY9YBvhIaKtj7CzzNANfC6n0EfH8tR wM/g== X-Gm-Message-State: ALoCoQlbEOBRxHpU4xHUu4rYU0gDpqPr55YSVgRZW9Xrk5X/KznLou5Z18i6o0rIkd6hUlQNTTya X-Received: by 10.152.88.70 with SMTP id be6mr4736915lab.9.1436358604457; Wed, 08 Jul 2015 05:30:04 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.21.230 with SMTP id y6ls1003403lae.20.gmail; Wed, 08 Jul 2015 05:30:04 -0700 (PDT) X-Received: by 10.152.28.73 with SMTP id z9mr9139683lag.93.1436358604207; Wed, 08 Jul 2015 05:30:04 -0700 (PDT) Received: from mail-la0-f48.google.com (mail-la0-f48.google.com. [209.85.215.48]) by mx.google.com with ESMTPS id mr8si1847351lbb.104.2015.07.08.05.30.04 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 Jul 2015 05:30:04 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.48 as permitted sender) client-ip=209.85.215.48; Received: by lagx9 with SMTP id x9so224139830lag.1 for ; Wed, 08 Jul 2015 05:30:04 -0700 (PDT) X-Received: by 10.152.26.163 with SMTP id m3mr9232533lag.86.1436358604065; Wed, 08 Jul 2015 05:30:04 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.108.230 with SMTP id hn6csp3060109lbb; Wed, 8 Jul 2015 05:30:03 -0700 (PDT) X-Received: by 10.70.64.162 with SMTP id p2mr20350110pds.54.1436358601993; Wed, 08 Jul 2015 05:30:01 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id tg9si3857451pab.202.2015.07.08.05.30.00; Wed, 08 Jul 2015 05:30:01 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758500AbbGHM3q (ORCPT + 29 others); Wed, 8 Jul 2015 08:29:46 -0400 Received: from mail-pd0-f170.google.com ([209.85.192.170]:34830 "EHLO mail-pd0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758460AbbGHM3l (ORCPT ); Wed, 8 Jul 2015 08:29:41 -0400 Received: by pdrg1 with SMTP id g1so13667091pdr.2 for ; Wed, 08 Jul 2015 05:29:40 -0700 (PDT) X-Received: by 10.68.135.233 with SMTP id pv9mr20326418pbb.115.1436358580912; Wed, 08 Jul 2015 05:29:40 -0700 (PDT) Received: from localhost.localdomain ([202.62.93.138]) by smtp.gmail.com with ESMTPSA id db1sm2415741pdb.50.2015.07.08.05.29.36 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 08 Jul 2015 05:29:39 -0700 (PDT) From: Vaibhav Hiremath To: linux-arm-kernel@lists.infradead.org Cc: Vaibhav Hiremath , Samuel Ortiz , Lee Jones , linux-kernel@vger.kernel.org (open list) Subject: [PATCH-v6 3/6] mfd: 88pm800: Get pdata from 'device' rather than passing as a parameter Date: Wed, 8 Jul 2015 17:56:29 +0530 Message-Id: <1436358392-15449-4-git-send-email-vaibhav.hiremath@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1436358392-15449-1-git-send-email-vaibhav.hiremath@linaro.org> References: <1436358392-15449-1-git-send-email-vaibhav.hiremath@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: vaibhav.hiremath@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.48 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Currently the device_xxx_init() fns take pdata as an input parameter to the fn, but the cleaner approach would be to use dev_get_platdata() to get the pdata. So this patch changes the code accordingly. Signed-off-by: Vaibhav Hiremath Acked-by: Lee Jones --- drivers/mfd/88pm800.c | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/drivers/mfd/88pm800.c b/drivers/mfd/88pm800.c index 95c418c..af8232f 100644 --- a/drivers/mfd/88pm800.c +++ b/drivers/mfd/88pm800.c @@ -254,11 +254,11 @@ static const struct regmap_irq pm800_irqs[] = { }, }; -static int device_gpadc_init(struct pm80x_chip *chip, - struct pm80x_platform_data *pdata) +static int device_gpadc_init(struct pm80x_chip *chip) { struct pm80x_subchip *subchip = chip->subchip; struct regmap *map = subchip->regmap_gpadc; + struct pm80x_platform_data *pdata = dev_get_platdata(chip->dev); int data = 0, mask = 0, ret = 0; if (!map) { @@ -320,17 +320,17 @@ out: return ret; } -static int device_onkey_init(struct pm80x_chip *chip, - struct pm80x_platform_data *pdata) +static int device_onkey_init(struct pm80x_chip *chip) { return mfd_add_devices(chip->dev, 0, &onkey_devs[0], ARRAY_SIZE(onkey_devs), &onkey_resources[0], 0, NULL); } -static int device_rtc_init(struct pm80x_chip *chip, - struct pm80x_platform_data *pdata) +static int device_rtc_init(struct pm80x_chip *chip) { + struct pm80x_platform_data *pdata = dev_get_platdata(chip->dev); + if (pdata) { rtc_devs[0].platform_data = pdata->rtc; rtc_devs[0].pdata_size = @@ -341,8 +341,7 @@ static int device_rtc_init(struct pm80x_chip *chip, ARRAY_SIZE(rtc_devs), NULL, 0, NULL); } -static int device_regulator_init(struct pm80x_chip *chip, - struct pm80x_platform_data *pdata) +static int device_regulator_init(struct pm80x_chip *chip) { return mfd_add_devices(chip->dev, 0, ®ulator_devs[0], ARRAY_SIZE(regulator_devs), NULL, 0, NULL); @@ -463,11 +462,11 @@ static void pm800_pages_exit(struct pm80x_chip *chip) i2c_unregister_device(subchip->gpadc_page); } -static int device_800_init(struct pm80x_chip *chip, - struct pm80x_platform_data *pdata) +static int device_800_init(struct pm80x_chip *chip) { int ret; unsigned int val; + struct pm80x_platform_data *pdata = dev_get_platdata(chip->dev); /* * alarm wake up bit will be clear in device_irq_init(), @@ -483,7 +482,7 @@ static int device_800_init(struct pm80x_chip *chip, pdata->rtc->rtc_wakeup = 1; } - ret = device_gpadc_init(chip, pdata); + ret = device_gpadc_init(chip); if (ret < 0) { dev_err(chip->dev, "[%s]Failed to init gpadc\n", __func__); goto out; @@ -497,19 +496,19 @@ static int device_800_init(struct pm80x_chip *chip, goto out; } - ret = device_onkey_init(chip, pdata); + ret = device_onkey_init(chip); if (ret) { dev_err(chip->dev, "Failed to add onkey subdev\n"); goto out_dev; } - ret = device_rtc_init(chip, pdata); + ret = device_rtc_init(chip); if (ret) { dev_err(chip->dev, "Failed to add rtc subdev\n"); goto out; } - ret = device_regulator_init(chip, pdata); + ret = device_regulator_init(chip); if (ret) { dev_err(chip->dev, "Failed to add regulators subdev\n"); goto out; @@ -575,7 +574,7 @@ static int pm800_probe(struct i2c_client *client, goto err_device_init; } - ret = device_800_init(chip, pdata); + ret = device_800_init(chip); if (ret) { dev_err(chip->dev, "Failed to initialize 88pm800 devices\n"); goto err_device_init;