From patchwork Mon Jun 15 09:28:23 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Zhu X-Patchwork-Id: 6607811 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@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 DFE119F326 for ; Mon, 15 Jun 2015 10:01:02 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6B0F120411 for ; Mon, 15 Jun 2015 10:01:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C9B6F2035D for ; Mon, 15 Jun 2015 10:01:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754166AbbFOKA6 (ORCPT ); Mon, 15 Jun 2015 06:00:58 -0400 Received: from mail-bn1bon0117.outbound.protection.outlook.com ([157.56.111.117]:61168 "EHLO na01-bn1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1756125AbbFOKAt (ORCPT ); Mon, 15 Jun 2015 06:00:49 -0400 X-Greylist: delayed 1065 seconds by postgrey-1.27 at vger.kernel.org; Mon, 15 Jun 2015 06:00:48 EDT Received: from DM2PR0301MB0862.namprd03.prod.outlook.com (10.160.215.148) by DM2PR0301MB0863.namprd03.prod.outlook.com (10.160.215.149) with Microsoft SMTP Server (TLS) id 15.1.190.14; Mon, 15 Jun 2015 09:28:23 +0000 Received: from DM2PR0301MB0862.namprd03.prod.outlook.com ([10.160.215.148]) by DM2PR0301MB0862.namprd03.prod.outlook.com ([10.160.215.148]) with mapi id 15.01.0190.013; Mon, 15 Jun 2015 09:28:23 +0000 From: Zhu Richard To: Bjorn Helgaas , Lucas Stach CC: Marek Vasut , "linux-pci@vger.kernel.org" , "linux-arm-kernel@lists.infradead.org" , Troy Kisky Subject: RE: [PATCH] PCI: imx6: Use "u32", not "uint32_t" Thread-Topic: [PATCH] PCI: imx6: Use "u32", not "uint32_t" Thread-Index: AQHQpU24wlLjiIDh6ESg/8WOrE5ZmJ2tTqiw Date: Mon, 15 Jun 2015 09:28:23 +0000 Message-ID: References: <20150612202357.17586.99216.stgit@bhelgaas-glaptop2.roam.corp.google.com> In-Reply-To: <20150612202357.17586.99216.stgit@bhelgaas-glaptop2.roam.corp.google.com> Accept-Language: zh-CN, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: google.com; dkim=none (message not signed) header.d=none; x-originating-ip: [199.59.231.64] x-microsoft-exchange-diagnostics: 1; DM2PR0301MB0863; 3:JbFU41VS56ZLslmoMxyFw+nSaRa5TBpeNUcTWMWYOkfqI5HwhxPxSawhUi4NNYPVrn7zh0BFG8pwNC3KSiVuNm2n7rTiAU9eFz/LQmRXsDu1B1sn8rqVv18oYIUsObH0bNR14zmAIGwY7fBI+eeDYQ==; 10:le/Yy0oxbydq/I64GHO8Vse9NUF0T5wPgk3RuZUc0lrAfbVD0tlWCM/K+Se22Fa1i2RGi3RblIYpmUn4NUvxkUXz5sXQxPicQJsD6WW+wE0=; 6:eF58+DlQQ94SVqvqfNCRPN653lp8LYKEMtCR8128RfDmAeG10N6XjsyfClqeY4rE x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:DM2PR0301MB0863; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:; x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(601004)(520003)(5005006)(3002001); SRVR:DM2PR0301MB0863; BCL:0; PCL:0; RULEID:; SRVR:DM2PR0301MB0863; x-forefront-prvs: 0608DEDB67 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(6009001)(377454003)(164054003)(66066001)(5001770100001)(122556002)(40100003)(77156002)(62966003)(86362001)(92566002)(76576001)(2900100001)(33656002)(19580405001)(74316001)(106116001)(2950100001)(5001960100002)(87936001)(2656002)(76176999)(54356999)(50986999)(102836002)(77096005)(46102003)(19580395003)(5003600100002)(5002640100001)(189998001); DIR:OUT; SFP:1102; SCL:1; SRVR:DM2PR0301MB0863; H:DM2PR0301MB0862.namprd03.prod.outlook.com; FPR:; SPF:None; MLV:sfv; LANG:en; MIME-Version: 1.0 X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-originalarrivaltime: 15 Jun 2015 09:28:23.2781 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 710a03f5-10f6-4d38-9ff4-a80b81da590d X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM2PR0301MB0863 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Spam-Status: No, score=-7.4 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 Thanks, to let it consistence. Acked-by: Richard Zhu Freescale Linux BSP team Best Regards Richard Zhu -----Original Message----- From: Bjorn Helgaas [mailto:bhelgaas@google.com] Sent: Saturday, June 13, 2015 4:24 AM To: Zhu Richard-R65037; Lucas Stach Cc: Marek Vasut; linux-pci@vger.kernel.org; linux-arm-kernel@lists.infradead.org; Troy Kisky Subject: [PATCH] PCI: imx6: Use "u32", not "uint32_t" Use "u32", not "uint32_t", for consistency. Use "tmp", not "temp", for consistency within the driver. Signed-off-by: Bjorn Helgaas --- drivers/pci/host/pci-imx6.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) - uint32_t tmp; + u32 tmp; int ret; /* @@ -450,19 +450,19 @@ static void imx6_pcie_host_init(struct pcie_port *pp) static void imx6_pcie_reset_phy(struct pcie_port *pp) { - uint32_t temp; + u32 tmp; - pcie_phy_read(pp->dbi_base, PHY_RX_OVRD_IN_LO, &temp); - temp |= (PHY_RX_OVRD_IN_LO_RX_DATA_EN | - PHY_RX_OVRD_IN_LO_RX_PLL_EN); - pcie_phy_write(pp->dbi_base, PHY_RX_OVRD_IN_LO, temp); + pcie_phy_read(pp->dbi_base, PHY_RX_OVRD_IN_LO, &tmp); + tmp |= (PHY_RX_OVRD_IN_LO_RX_DATA_EN | + PHY_RX_OVRD_IN_LO_RX_PLL_EN); + pcie_phy_write(pp->dbi_base, PHY_RX_OVRD_IN_LO, tmp); usleep_range(2000, 3000); - pcie_phy_read(pp->dbi_base, PHY_RX_OVRD_IN_LO, &temp); - temp &= ~(PHY_RX_OVRD_IN_LO_RX_DATA_EN | + pcie_phy_read(pp->dbi_base, PHY_RX_OVRD_IN_LO, &tmp); + tmp &= ~(PHY_RX_OVRD_IN_LO_RX_DATA_EN | PHY_RX_OVRD_IN_LO_RX_PLL_EN); - pcie_phy_write(pp->dbi_base, PHY_RX_OVRD_IN_LO, temp); + pcie_phy_write(pp->dbi_base, PHY_RX_OVRD_IN_LO, tmp); } static int imx6_pcie_link_up(struct pcie_port *pp) diff --git a/drivers/pci/host/pci-imx6.c b/drivers/pci/host/pci-imx6.c index 2bbd38d..a032c01 100644 --- a/drivers/pci/host/pci-imx6.c +++ b/drivers/pci/host/pci-imx6.c @@ -354,7 +354,7 @@ static int imx6_pcie_wait_for_link(struct pcie_port *pp) static int imx6_pcie_wait_for_speed_change(struct pcie_port *pp) { - uint32_t tmp; + u32 tmp; unsigned int retries; for (retries = 0; retries < 200; retries++) @@ -379,7 +379,7 @@ static irqreturn_t imx6_pcie_msi_handler(int irq, void *arg) static int imx6_pcie_start_link(struct pcie_port *pp) { struct imx6_pcie *imx6_pcie = to_imx6_pcie(pp);