From patchwork Fri Jun 17 05:00:21 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: chris@lapa.com.au X-Patchwork-Id: 9182443 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 144AA6075F for ; Fri, 17 Jun 2016 05:01:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 077972094F for ; Fri, 17 Jun 2016 05:01:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EED3628399; Fri, 17 Jun 2016 05:01:01 +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=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DB86F2839C for ; Fri, 17 Jun 2016 05:00:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933521AbcFQFAn (ORCPT ); Fri, 17 Jun 2016 01:00:43 -0400 Received: from mail-pf0-f196.google.com ([209.85.192.196]:35497 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933474AbcFQFAm (ORCPT ); Fri, 17 Jun 2016 01:00:42 -0400 Received: by mail-pf0-f196.google.com with SMTP id t190so5372405pfb.2 for ; Thu, 16 Jun 2016 22:00:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lapa-com-au.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=EZmGbT6bK5GMYH4GLe7RAKCoIOiU8OE/Fr5aLahjf0U=; b=DVT6gSBw6WgG9N/iOUcb0HwjNJ4LZjOBKGA8OQLHS1Uv9O5AwCFIZdLu/q8ReZrTP/ wHSzgvH9WdYLMD7xr8fJFl+HVY52d1vxxpOvELHWdKEiYZsuRSXasJFkFq5CA2P05Rv7 evbZJV6Lr6wXnUPmu4uuhFjAXcYosVsZvxu1k0M/F7fYZE0P+w9rlvH8LSnzLJ9eiETs +XA+NELUbkSq0Xw2a5+PO7ctKE1HMaUYyxvc16CByOvaSYfunaZt86dYhhogXGLFsk35 GZWOQQBCmWMkrEon2ckCLFUcfgCeXYkLKF6nsaER0MSgA3M75/YpcwCHo0GsoE2qx5Q8 vjDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=EZmGbT6bK5GMYH4GLe7RAKCoIOiU8OE/Fr5aLahjf0U=; b=UWXxXV/kuShyk2YAZrHf8MkyMxASEidY/gmtTQHmVYTplLdEd7joZxizLp37r23dVa fLgKvunEd4MbZgvyS1M/uQKyuM9DKi9BsCoKYrkMMDCEOpaEeAW7OctdFbbmV6KnJVTs g7eaes156413UsNPx+HKKs6zw6T7KjwBwBO91WjSHtz5BY03agtXi2+v3mnpoOQDJAA0 dSDZGk51WcKPYvdJe6u0CIe1prtffQ8s20TnwoTSz96azRgYyhirSiVo3LDq/olpN2GM Z1GtsruDzAQpyVqgr/viLXA/GhD3xcSsB5qNMIK7nvhiZ5YI7c5ThRWhmLLXA2An6nfh D9Jw== X-Gm-Message-State: ALyK8tIO0WJoVjWyoh5vo1C7pPatQoXRMwhk+mzo7xhbAvsWNiozPfstcPh00TRZz8EX/Q== X-Received: by 10.98.5.196 with SMTP id 187mr208341pff.133.1466139641744; Thu, 16 Jun 2016 22:00:41 -0700 (PDT) Received: from bbb-dev.management.cpd (163.164.70.115.static.exetel.com.au. [115.70.164.163]) by smtp.gmail.com with ESMTPSA id d2sm60999741pfk.36.2016.06.16.22.00.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 16 Jun 2016 22:00:41 -0700 (PDT) From: Chris Lapa X-Google-Original-From: Chris Lapa To: k.kozlowski@samsung.com, dwmw2@infradead.org, dbaryshkov@gmail.com, sre@kernel.org, mark.rutland@arm.com, robh+dt@kernel.org Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, Chris Lapa Subject: [PATCH v3 2/7] max8903: store pointer to pdata instead of copying it. Date: Fri, 17 Jun 2016 15:00:21 +1000 Message-Id: <1466139626-51434-3-git-send-email-chris@lapa.com.au> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1466139626-51434-1-git-send-email-chris@lapa.com.au> References: <1464849897-21527-3-git-send-email-chris@lapa.com.au> <1466139626-51434-1-git-send-email-chris@lapa.com.au> In-Reply-To: <1464849897-21527-3-git-send-email-chris@lapa.com.au> References: <1464849897-21527-3-git-send-email-chris@lapa.com.au> Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Chris Lapa Stores pointer to pdata because it easily allows pdata to reference either platform data or in the future device tree data. Signed-off-by: Chris Lapa Reviewed-by: Krzysztof Kozlowski --- drivers/power/max8903_charger.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/drivers/power/max8903_charger.c b/drivers/power/max8903_charger.c index 17876ca..0a5b0e1 100644 --- a/drivers/power/max8903_charger.c +++ b/drivers/power/max8903_charger.c @@ -29,7 +29,7 @@ #include struct max8903_data { - struct max8903_pdata pdata; + struct max8903_pdata *pdata; struct device *dev; struct power_supply *psy; struct power_supply_desc psy_desc; @@ -53,8 +53,8 @@ static int max8903_get_property(struct power_supply *psy, switch (psp) { case POWER_SUPPLY_PROP_STATUS: val->intval = POWER_SUPPLY_STATUS_UNKNOWN; - if (data->pdata.chg) { - if (gpio_get_value(data->pdata.chg) == 0) + if (data->pdata->chg) { + if (gpio_get_value(data->pdata->chg) == 0) val->intval = POWER_SUPPLY_STATUS_CHARGING; else if (data->usb_in || data->ta_in) val->intval = POWER_SUPPLY_STATUS_NOT_CHARGING; @@ -81,7 +81,7 @@ static int max8903_get_property(struct power_supply *psy, static irqreturn_t max8903_dcin(int irq, void *_data) { struct max8903_data *data = _data; - struct max8903_pdata *pdata = &data->pdata; + struct max8903_pdata *pdata = data->pdata; bool ta_in; enum power_supply_type old_type; @@ -122,7 +122,7 @@ static irqreturn_t max8903_dcin(int irq, void *_data) static irqreturn_t max8903_usbin(int irq, void *_data) { struct max8903_data *data = _data; - struct max8903_pdata *pdata = &data->pdata; + struct max8903_pdata *pdata = data->pdata; bool usb_in; enum power_supply_type old_type; @@ -161,7 +161,7 @@ static irqreturn_t max8903_usbin(int irq, void *_data) static irqreturn_t max8903_fault(int irq, void *_data) { struct max8903_data *data = _data; - struct max8903_pdata *pdata = &data->pdata; + struct max8903_pdata *pdata = data->pdata; bool fault; fault = gpio_get_value(pdata->flt) ? false : true; @@ -190,12 +190,18 @@ static int max8903_probe(struct platform_device *pdev) int ta_in = 0; int usb_in = 0; + if (pdata == NULL) { + dev_err(dev, "No platform data.\n"); + return -EINVAL; + } + data = devm_kzalloc(dev, sizeof(struct max8903_data), GFP_KERNEL); if (data == NULL) { dev_err(dev, "Cannot allocate memory.\n"); return -ENOMEM; } - memcpy(&data->pdata, pdata, sizeof(struct max8903_pdata)); + + data->pdata = pdev->dev.platform_data; data->dev = dev; platform_set_drvdata(pdev, data);