From patchwork Fri Aug 2 00:52:05 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julius Werner X-Patchwork-Id: 2837431 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 0BD60BF535 for ; Fri, 2 Aug 2013 00:54:38 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3147E20158 for ; Fri, 2 Aug 2013 00:54:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2F0622013D for ; Fri, 2 Aug 2013 00:54:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752156Ab3HBAxj (ORCPT ); Thu, 1 Aug 2013 20:53:39 -0400 Received: from mail-pb0-f46.google.com ([209.85.160.46]:47648 "EHLO mail-pb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753107Ab3HBAxG (ORCPT ); Thu, 1 Aug 2013 20:53:06 -0400 Received: by mail-pb0-f46.google.com with SMTP id rq2so52078pbb.19 for ; Thu, 01 Aug 2013 17:53:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=QQQ76M3knykNwVR0KUwjxeIsvD1SmcXXiqmNAGHE1Us=; b=iuErY3uJBwY1utWmGD04jJVDjk2naXFQp5mTF9/rMOkgjF8I0i0m7CTq2kadsChdKI qRBYk2rCxYWhx3gcFpF+qbl2xXNkDM6UHVGAHnpEeHO2Ye/gPp+pEySt0HVZORsAV13c 3Ljx+7OZVJPXrEw6ogdH2do3RDoS/zC86shio= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=QQQ76M3knykNwVR0KUwjxeIsvD1SmcXXiqmNAGHE1Us=; b=PHA/RzESVOzAWEZZSZdWOVsChUi2rRjX27QOdvgvwrRoLBPoeFCoR3rWprAiFatGQJ Ac49iTE3SRzO/sjvlaGlgt2mX2k+lsISSSFTJNZMEV485EXaWDxI/9q/Kn0eGGpF5QDU W/DYGfRxIThJo99NUHdUXA0VzBW7sTDemyZ2xV9DZr90eiqM7dtdoXUfvdj89b/FWhdf q/E+r7TLAZu/wgHVHZ5xVIh61mXbrjmKC/t7JW4Fhc2CfRtjExPIwP5sMBgU2ZxX5Axg r9JneI4ZLkUMy3S17tlwO8J8JBsQI/XNuAJkV1vyrNRKQdd/odtNHS3zRnog3w+BRT3i LETQ== X-Received: by 10.68.164.1 with SMTP id ym1mr4946186pbb.33.1375404785745; Thu, 01 Aug 2013 17:53:05 -0700 (PDT) Received: from jwerner-linux.mtv.corp.google.com (jwerner-linux.mtv.corp.google.com [172.22.72.75]) by mx.google.com with ESMTPSA id mr3sm6711199pbb.27.2013.08.01.17.53.04 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 01 Aug 2013 17:53:05 -0700 (PDT) From: Julius Werner To: Felipe Balbi Cc: linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, linux-samsung-soc@vger.kernel.org, Tomasz Figa , Vivek Gautam , devicetree@vger.kernel.org, Sylwester Nawrocki , Julius Werner Subject: [PATCH 2/3] usb: phy-samsung-usb: trivial: rename pmuregs variable Date: Thu, 1 Aug 2013 17:52:05 -0700 Message-Id: <1375404726-26264-3-git-send-email-jwerner@chromium.org> X-Mailer: git-send-email 1.8.3 In-Reply-To: <1375404726-26264-1-git-send-email-jwerner@chromium.org> References: <1375404726-26264-1-git-send-email-jwerner@chromium.org> X-Gm-Message-State: ALoCoQmug/kJcTVuuAoHKLzSKXdCPByBad+XZUd+tc8Temg/t7gwf7s1kmseawGUpxtDW6QJU7tk 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=-8.3 required=5.0 tests=BAYES_00,DKIM_SIGNED, 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 Now that the sphy->pmuregs variable always points to only a single register, let's rename it to make that more clear. Signed-off-by: Julius Werner --- drivers/usb/phy/phy-samsung-usb.c | 14 +++++++------- drivers/usb/phy/phy-samsung-usb.h | 4 ++-- drivers/usb/phy/phy-samsung-usb2.c | 4 ++-- drivers/usb/phy/phy-samsung-usb3.c | 4 ++-- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/drivers/usb/phy/phy-samsung-usb.c b/drivers/usb/phy/phy-samsung-usb.c index 51cad19..fa382c9 100644 --- a/drivers/usb/phy/phy-samsung-usb.c +++ b/drivers/usb/phy/phy-samsung-usb.c @@ -42,9 +42,9 @@ int samsung_usbphy_parse_dt(struct samsung_usbphy *sphy) return -ENODEV; } - sphy->pmuregs = of_iomap(usbphy_sys, 0); + sphy->pmureg = of_iomap(usbphy_sys, 0); - if (sphy->pmuregs == NULL) { + if (sphy->pmureg == NULL) { dev_err(sphy->dev, "Can't get usb-phy pmu control register\n"); goto err0; } @@ -77,23 +77,23 @@ void samsung_usbphy_set_isolation_4210(struct samsung_usbphy *sphy, bool on) { u32 reg_val; - if (!sphy->pmuregs) { + if (!sphy->pmureg) { dev_warn(sphy->dev, "Can't set pmu isolation\n"); return; } - reg_val = readl(sphy->pmuregs); + reg_val = readl(sphy->pmureg); if (on) reg_val &= ~sphy->drv_data->phy_en_mask; else reg_val |= sphy->drv_data->phy_en_mask; - writel(reg_val, sphy->pmuregs); + writel(reg_val, sphy->pmureg); if (sphy->drv_data->cpu_type == TYPE_EXYNOS4X12) { - writel(reg_val, sphy->pmuregs + EXYNOS4X12_PHY_HSIC_CTRL0); - writel(reg_val, sphy->pmuregs + EXYNOS4X12_PHY_HSIC_CTRL1); + writel(reg_val, sphy->pmureg + EXYNOS4X12_PHY_HSIC_CTRL0); + writel(reg_val, sphy->pmureg + EXYNOS4X12_PHY_HSIC_CTRL1); } } EXPORT_SYMBOL_GPL(samsung_usbphy_set_isolation_4210); diff --git a/drivers/usb/phy/phy-samsung-usb.h b/drivers/usb/phy/phy-samsung-usb.h index a817af5..f2e9c4a 100644 --- a/drivers/usb/phy/phy-samsung-usb.h +++ b/drivers/usb/phy/phy-samsung-usb.h @@ -281,7 +281,7 @@ struct samsung_usbphy_drvdata { * @dev: The parent device supplied to the probe function * @clk: usb phy clock * @regs: usb phy controller registers memory base - * @pmuregs: USB device PHY_CONTROL register memory base + * @pmureg: USB device PHY_CONTROL register address * @sysreg: USB2.0 PHY_CFG register memory base * @ref_clk_freq: reference clock frequency selection * @drv_data: driver data available for different SoCs @@ -296,7 +296,7 @@ struct samsung_usbphy { struct device *dev; struct clk *clk; void __iomem *regs; - void __iomem *pmuregs; + void __iomem *pmureg; void __iomem *sysreg; int ref_clk_freq; const struct samsung_usbphy_drvdata *drv_data; diff --git a/drivers/usb/phy/phy-samsung-usb2.c b/drivers/usb/phy/phy-samsung-usb2.c index adbaa8c..c2c83d4 100644 --- a/drivers/usb/phy/phy-samsung-usb2.c +++ b/drivers/usb/phy/phy-samsung-usb2.c @@ -435,8 +435,8 @@ static int samsung_usb2phy_remove(struct platform_device *pdev) usb_remove_phy(&sphy->phy); - if (sphy->pmuregs) - iounmap(sphy->pmuregs); + if (sphy->pmureg) + iounmap(sphy->pmureg); if (sphy->sysreg) iounmap(sphy->sysreg); diff --git a/drivers/usb/phy/phy-samsung-usb3.c b/drivers/usb/phy/phy-samsung-usb3.c index 3ad9579..6259a35 100644 --- a/drivers/usb/phy/phy-samsung-usb3.c +++ b/drivers/usb/phy/phy-samsung-usb3.c @@ -292,8 +292,8 @@ static int samsung_usb3phy_remove(struct platform_device *pdev) usb_remove_phy(&sphy->phy); - if (sphy->pmuregs) - iounmap(sphy->pmuregs); + if (sphy->pmureg) + iounmap(sphy->pmureg); if (sphy->sysreg) iounmap(sphy->sysreg);