From patchwork Tue Feb 2 10:18:51 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yoshihiro Shimoda X-Patchwork-Id: 8188311 X-Patchwork-Delegate: horms@verge.net.au Return-Path: X-Original-To: patchwork-linux-renesas-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 C42629FBE9 for ; Tue, 2 Feb 2016 10:19:42 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id F3E0320263 for ; Tue, 2 Feb 2016 10:19:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 178882021F for ; Tue, 2 Feb 2016 10:19:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754491AbcBBKTk (ORCPT ); Tue, 2 Feb 2016 05:19:40 -0500 Received: from relmlor4.renesas.com ([210.160.252.174]:40340 "EHLO relmlie3.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754281AbcBBKTj (ORCPT ); Tue, 2 Feb 2016 05:19:39 -0500 Received: from unknown (HELO relmlir1.idc.renesas.com) ([10.200.68.151]) by relmlie3.idc.renesas.com with ESMTP; 02 Feb 2016 19:19:38 +0900 Received: from relmlac3.idc.renesas.com (relmlac3.idc.renesas.com [10.200.69.23]) by relmlir1.idc.renesas.com (Postfix) with ESMTP id 1C89241ABF; Tue, 2 Feb 2016 19:19:38 +0900 (JST) Received: by relmlac3.idc.renesas.com (Postfix, from userid 0) id 1483B1806F; Tue, 2 Feb 2016 19:19:38 +0900 (JST) Received: from relmlac3.idc.renesas.com (localhost [127.0.0.1]) by relmlac3.idc.renesas.com (Postfix) with ESMTP id 0E9C41800A; Tue, 2 Feb 2016 19:19:38 +0900 (JST) Received: from relmlii1.idc.renesas.com [10.200.68.65] by relmlac3.idc.renesas.com with ESMTP id VAV14342; Tue, 2 Feb 2016 19:19:37 +0900 X-IronPort-AV: E=Sophos;i="5.22,384,1449500400"; d="scan'";a="203571093" Received: from mail-sg2apc01lp0239.outbound.protection.outlook.com (HELO APC01-SG2-obe.outbound.protection.outlook.com) ([65.55.88.239]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-SHA; 02 Feb 2016 19:19:36 +0900 Authentication-Results: verge.net.au; dkim=none (message not signed) header.d=none; verge.net.au; dmarc=none action=none header.from=renesas.com; Received: from localhost (211.11.155.144) by SG2PR06MB0918.apcprd06.prod.outlook.com (10.162.201.158) with Microsoft SMTP Server (TLS) id 15.1.396.15; Tue, 2 Feb 2016 10:19:35 +0000 From: Yoshihiro Shimoda To: , , , , , , CC: , , Yoshihiro Shimoda Subject: [PATCH/RFC 03/10] phy: rcar-gen3-usb2: remove unnecesary struct rcar_gen3_data Date: Tue, 2 Feb 2016 19:18:51 +0900 Message-ID: <1454408338-4612-4-git-send-email-yoshihiro.shimoda.uh@renesas.com> X-Mailer: git-send-email 1.9.4.msysgit.1 In-Reply-To: <1454408338-4612-1-git-send-email-yoshihiro.shimoda.uh@renesas.com> References: <1454408338-4612-1-git-send-email-yoshihiro.shimoda.uh@renesas.com> MIME-Version: 1.0 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: OS1PR01CA0022.jpnprd01.prod.outlook.com (25.161.225.160) To SG2PR06MB0918.apcprd06.prod.outlook.com (25.162.201.158) X-Microsoft-Exchange-Diagnostics: 1; SG2PR06MB0918; 2:YsKvbCk+eolmTt847Lqpd3CCndjH8jGPwsuv/hM2qkMAh1a+0UEPALWzFLWX8S5EHSA1X6kvch77Ic3+li6O0uI/Lvwh12LDm54WG88t7fC5j0lx14oZheaFms8TioATEJmwi6a0TvYaxkATeJatjw==; 3:CgX7vMT2+9WDfMxreB+TRwUT8fm0A6H6dOW7ZgDQ46/ida56lvComkT/3aXjjRmUmHt/4sGdCgxqfEwFYad12ScAlZj62tNVfO40ep+AuWfuYYSQk/Udc2icihv2QCbL; 25:/EAFylw/UR9ejyFYPAoCzNflkA6F1YTo+DCwNw5GmgEhldK4J3e9vshME2rEXrEfmasNsmexgfu6184lXbI1mjL2xoY5XOE/YnkMwhpW2xOZcJkhJWrQcyGo57iZtyfgEhhR+/E6dA2C9DSvFdBBuoCfYi0AcMVVJKiF8lZKQDQn5b80/hWsqvf9qlhjkTznQf2S1C4+7TyawzWL6eHWQRv1aW5HKDtPiPCkicvPvfc9QDxKZ0vlx5o0SR2ze9EY X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:SG2PR06MB0918; X-MS-Office365-Filtering-Correlation-Id: 65bab8a7-c1a2-4bb7-0fbb-08d32bba5982 X-Microsoft-Exchange-Diagnostics: 1; SG2PR06MB0918; 20:oEjqGhtQhN24NHqN4l/dCPcz2TpFPbEaL61+q0+j2ujGmCAdzIN50e8hU5JjHEQIljg7PjZJ5AztiF0SVqDZXY0qlSFD3vb7NrLaI2DWJr25K/TH+SdbRK33QzD3AbxsPokyA3RlFw5PdJCWBV2DAjluKyJhhL0yRaee5labEXRhB3cIdpl4VoEU26LYok7vF3Rz2j5UbnOrrrDkgM7609V9wTuibpGPpzshEbBckT/NRKyPFyxPaGwlBgLuWgm9/e6lGW6WfN63zzNlJiuu1/73ktt74RUswOR3WoIO5oaKOP95vlkEECO5k230ImLNRdWfoLxkR5Ata9/eheK9tPm0bYB16CTJNAMFxfbtPp8ULrVdhFYQkpK/pN/A801EVESIpQcryRQLvUtSeKd0dvD0pHSNIQEOuoYZWjQ7o0fwHh8y2Uj5vPepG/grrFurqevqZrp3NFXHRn6gCuwN9dn7FfUxAoPPEfdaXLk5XDHQ3qM+VrKwhD7Ify2b5reO; 4:CxDcAAg4XZtGpXCmx7XIrD2VsrIKG1ecYmB/Wqb417dYHzLfUoiv4RxXLufLeECwidC8M7MAiej6gpnqcoA1pYWa50hQG+lAeEF/4HK/yThT37a1OQHPFdCeO5OuiF4BLsJK1jk4dXbN80ZkHhftfib2OXNsRtWLlVlwTVs7dZCwaAuNG9O3J5Hh4ZqkYMAPc0QDGgV5OmH7wHGSVBl56iFtwrDPSE3DEaYVQ+BOqL+3Q3Xko5hGye2kXglB00nzjwKGivubOzvKG1AFI/FrtcfT9j/HYB6sla7lzbAa2tFMjY9v2BgP9IWzvn1z8T00AFiApg94IAI7sfIZc26RxK7tT4SRErEAJayQDwLuercvFUQGeuSEFh8K8DpWTrJeidxsN3JkkQjOtT7eRARgnpxH40oP9wRRloJenw 7RIi8= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(85106069007906); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(5005006)(8121501046)(3002001)(10201501046); SRVR:SG2PR06MB0918; BCL:0; PCL:0; RULEID:; SRVR:SG2PR06MB0918; X-Forefront-PRVS: 084080FC15 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(6009001)(6069001)(76176999)(50986999)(87976001)(76506005)(4001430100002)(42186005)(3470700001)(78352003)(1096002)(230783001)(229853001)(33646002)(42382002)(50466002)(2906002)(3846002)(6116002)(586003)(5004730100002)(4326007)(5003940100001)(92566002)(36756003)(5001770100001)(5008740100001)(48376002)(189998001)(66066001)(40100003)(5001960100002)(19580405001)(107886002)(77096005)(2950100001)(50226001)(47776003)(122386002)(19580395003); DIR:OUT; SFP:1102; SCL:1; SRVR:SG2PR06MB0918; H:localhost; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SG2PR06MB0918; 23:9fxQSGVN6NpFXEv2mM8IUSszDhXMKv2QWwQvA8cT1?= =?us-ascii?Q?BOTF1ojPGY49QS1BzS5mwV1NzwNpnX6pkrmZoMjGIksVusP5eRCVcPd7Z6UO?= =?us-ascii?Q?9aiZ95A2MAMFImehDo4NefnOvmClbvl2Hy1ut8fvRrIlfGPDz0w8+4govXFY?= =?us-ascii?Q?ap8qMG7eVTiMMYeEl2HydgB8BdzKqCGQxxn6rULGO/OZMAzVJ6+8Vo78A2/7?= =?us-ascii?Q?H9Ej/w+k1gbazegYIF7POXu5DAg7odDHHbP0oibI27/Af/YeOG4G/YJsQPn5?= =?us-ascii?Q?3UK9VzWvSxM5Bke2EFGZqZvVH67uytyhXI5gk6D5NkRUUjWhoHt7Uxy1GZ2i?= =?us-ascii?Q?JEDujBoaE14/Pb1DUJTzyHa9QRkDYaXKuu3naXOHSB3sN1YLtypHeNmBJfbK?= =?us-ascii?Q?3t+pKBsmBXBApM9OB+9lk4+Yrp9yMbgcnbpDeWsYUMe5pyQXFl5eNNxf+u2a?= =?us-ascii?Q?m2FIwJt7D4jFFzGvhqWY0ObX6BKT4D4E8fxhTcUaNc31y3jSy5EsOypkIoIk?= =?us-ascii?Q?IShrkJ9jJr+KYIufEjvX50BZmn4sHLjE+n8hNJimXE0887dYloKnMI9tT/1z?= =?us-ascii?Q?6EQ2rDldjg4d24HVDyeIzjYP96rGPWkPuhNDTSbz+wFVz+h0Rbiizp0C1lzI?= =?us-ascii?Q?fXwhfMxL2/A0dW4Spn5GBCWLbTyzzVByExSRvRplvrxvjlOtQIgnGmniipzH?= =?us-ascii?Q?E9O4tiY0K71gH0pbmxhlfJBZGrIUbYgvr5lMDQjTvQqSGLjtuKybcopqc/hN?= =?us-ascii?Q?tG+z6v7eai3JN3XaUrsXnBrlmeXqZDrEpXw0f6FUyBAzdJT4VCWa5F6QPBKi?= =?us-ascii?Q?ol7C050dcvboJRLfO+tFLnY376KG9wG70jt49Q/rmzGCiUPkuURtcJMXwS3R?= =?us-ascii?Q?R2sUPK2TQXCzQU+aar63IgYvLNa+wL+xp3+fytmzSgj5PF+gR1T2kf6N9lNe?= =?us-ascii?Q?Iw0kIItr98tmX2WMX41zekIVbpAiJiQZRonHkkVC67+ktJIV4kCc49TAFV09?= =?us-ascii?Q?cq3M0gxQzo+lzumgWsj1AlZOBlK75C+sLx/bAAgTteV6KTzXspD92RuHpfnF?= =?us-ascii?Q?c7OXwXtNhX1uRwgqVNi207ED9CjtOT2g8vAd1v9Q9eRJy+P1Q=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; SG2PR06MB0918; 5:t6taKb0ArZfnuSHZa4rNrf7qjS4fgRJpYLd/VD5pOy5i5v/2QkNi+Rx7uD3ZKl6Q4ZSDxNXRRDAX4wZrtNJ9JnQfeRUHqrRJCwbLm5BVAGmP3l/EzSuvEToFxG0l9oqpKamdAPwx6bP5LBw7SOgB2Q==; 24:oVZd3+X+9o/v/sih3nxtH2DN7kV0FEFn70L9HXrqJxk/4Eg20MWe6UH2BFy/1d/Be2sFlsUzF9sMtGqiudgoMMPW2tEcZYxojMzCxh2NT5g=; 20:TyD6OobDypgcSfCqpoxtl5td8U5St23ZARSMlhRIRnkWtcJQwoKqXxqB0OgW5Mq3QA+Zz/x8v06lLL1il6fmrNRQ6hnQgHbTUNj/qNMbvJG1wFb1rT7iMCUuGnnPATEp7BJH+Onm/0UJvWdfuGZumfOkaJp6WETS0RSjpAUtCwc= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Feb 2016 10:19:35.1854 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: SG2PR06MB0918 Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, 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 Since this driver uses the struct rcar_gen3_data in struct rcar_gen3_chan only, we can remove the rcar_gen3_data. Signed-off-by: Yoshihiro Shimoda --- drivers/phy/phy-rcar-gen3-usb2.c | 33 ++++++++++++++------------------- 1 file changed, 14 insertions(+), 19 deletions(-) diff --git a/drivers/phy/phy-rcar-gen3-usb2.c b/drivers/phy/phy-rcar-gen3-usb2.c index bc4f7dd..2da2148 100644 --- a/drivers/phy/phy-rcar-gen3-usb2.c +++ b/drivers/phy/phy-rcar-gen3-usb2.c @@ -74,20 +74,15 @@ #define USB2_ADPCTRL_IDPULLUP BIT(5) /* 1 = ID sampling is enabled */ #define USB2_ADPCTRL_DRVVBUS BIT(4) -struct rcar_gen3_data { - void __iomem *base; - struct clk *clk; -}; - struct rcar_gen3_chan { - struct rcar_gen3_data usb2; + void __iomem *base; struct phy *phy; bool has_otg; }; static void rcar_gen3_set_host_mode(struct rcar_gen3_chan *ch, int host) { - void __iomem *usb2_base = ch->usb2.base; + void __iomem *usb2_base = ch->base; u32 val = readl(usb2_base + USB2_COMMCTRL); dev_vdbg(&ch->phy->dev, "%s: %08x, %d\n", __func__, val, host); @@ -100,7 +95,7 @@ static void rcar_gen3_set_host_mode(struct rcar_gen3_chan *ch, int host) static void rcar_gen3_set_linectrl(struct rcar_gen3_chan *ch, int dp, int dm) { - void __iomem *usb2_base = ch->usb2.base; + void __iomem *usb2_base = ch->base; u32 val = readl(usb2_base + USB2_LINECTRL1); dev_vdbg(&ch->phy->dev, "%s: %08x, %d, %d\n", __func__, val, dp, dm); @@ -114,7 +109,7 @@ static void rcar_gen3_set_linectrl(struct rcar_gen3_chan *ch, int dp, int dm) static void rcar_gen3_enable_vbus_ctrl(struct rcar_gen3_chan *ch, int vbus) { - void __iomem *usb2_base = ch->usb2.base; + void __iomem *usb2_base = ch->base; u32 val = readl(usb2_base + USB2_ADPCTRL); dev_vdbg(&ch->phy->dev, "%s: %08x, %d\n", __func__, val, vbus); @@ -141,13 +136,13 @@ static void rcar_gen3_init_for_peri(struct rcar_gen3_chan *ch) static bool rcar_gen3_check_vbus(struct rcar_gen3_chan *ch) { - return !!(readl(ch->usb2.base + USB2_ADPCTRL) & + return !!(readl(ch->base + USB2_ADPCTRL) & USB2_ADPCTRL_OTGSESSVLD); } static bool rcar_gen3_check_id(struct rcar_gen3_chan *ch) { - return !!(readl(ch->usb2.base + USB2_ADPCTRL) & USB2_ADPCTRL_IDDIG); + return !!(readl(ch->base + USB2_ADPCTRL) & USB2_ADPCTRL_IDDIG); } static void rcar_gen3_device_recognition(struct rcar_gen3_chan *ch) @@ -166,7 +161,7 @@ static void rcar_gen3_device_recognition(struct rcar_gen3_chan *ch) static void rcar_gen3_init_otg(struct rcar_gen3_chan *ch) { - void __iomem *usb2_base = ch->usb2.base; + void __iomem *usb2_base = ch->base; u32 val; val = readl(usb2_base + USB2_VBCTRL); @@ -187,7 +182,7 @@ static void rcar_gen3_init_otg(struct rcar_gen3_chan *ch) static int rcar_gen3_phy_usb2_init(struct phy *p) { struct rcar_gen3_chan *channel = phy_get_drvdata(p); - void __iomem *usb2_base = channel->usb2.base; + void __iomem *usb2_base = channel->base; /* Initialize USB2 part */ writel(USB2_INT_ENABLE_INIT, usb2_base + USB2_INT_ENABLE); @@ -205,7 +200,7 @@ static int rcar_gen3_phy_usb2_exit(struct phy *p) { struct rcar_gen3_chan *channel = phy_get_drvdata(p); - writel(0, channel->usb2.base + USB2_INT_ENABLE); + writel(0, channel->base + USB2_INT_ENABLE); return 0; } @@ -213,7 +208,7 @@ static int rcar_gen3_phy_usb2_exit(struct phy *p) static int rcar_gen3_phy_usb2_power_on(struct phy *p) { struct rcar_gen3_chan *channel = phy_get_drvdata(p); - void __iomem *usb2_base = channel->usb2.base; + void __iomem *usb2_base = channel->base; u32 val; val = readl(usb2_base + USB2_USBCTR); @@ -235,7 +230,7 @@ static struct phy_ops rcar_gen3_phy_usb2_ops = { static irqreturn_t rcar_gen3_phy_usb2_irq(int irq, void *_ch) { struct rcar_gen3_chan *ch = _ch; - void __iomem *usb2_base = ch->usb2.base; + void __iomem *usb2_base = ch->base; u32 status = readl(usb2_base + USB2_OBINTSTA); irqreturn_t ret = IRQ_NONE; @@ -273,9 +268,9 @@ static int rcar_gen3_phy_usb2_probe(struct platform_device *pdev) return -ENOMEM; res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - channel->usb2.base = devm_ioremap_resource(dev, res); - if (IS_ERR(channel->usb2.base)) - return PTR_ERR(channel->usb2.base); + channel->base = devm_ioremap_resource(dev, res); + if (IS_ERR(channel->base)) + return PTR_ERR(channel->base); /* call request_irq for OTG */ irq = platform_get_irq(pdev, 0);