From patchwork Fri Jun 12 20:23:57 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 6600811 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id ECADBC0020 for ; Fri, 12 Jun 2015 20:26:51 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2A15220650 for ; Fri, 12 Jun 2015 20:26:51 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5C1D520646 for ; Fri, 12 Jun 2015 20:26:50 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Z3VV4-0003y4-W3; Fri, 12 Jun 2015 20:24:26 +0000 Received: from mail-ie0-x234.google.com ([2607:f8b0:4001:c03::234]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Z3VV0-0003w7-OU for linux-arm-kernel@lists.infradead.org; Fri, 12 Jun 2015 20:24:23 +0000 Received: by iebgx4 with SMTP id gx4so31063862ieb.0 for ; Fri, 12 Jun 2015 13:23:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=subject:to:from:cc:date:message-id:user-agent:mime-version :content-type:content-transfer-encoding; bh=+/ugzc2QSep5Hm2w9wSMaONBCWQA1p0LtMOhX8qS8LU=; b=bz5zDIjzI0ASoNI7ocGkvoWsDVFyMKqQsz33GOOou7Y9ut1wD0u44Je4Wd1sTxPMoE RvW30tyhBj5p5RQxAIkWrYXxVrhn3IVDagNFMBgmsQ/NTF0WuEO59qQIzX+p358Ory71 ioBA8mN3353ZVV5ikLHXsUxeioRIoOO85w9I2TJbWU11v+2cpygxFmkoF8UzTOLWh3TQ NcU8Et7yOL+LpTJH3l4W6AlYJzJh+udAkpf9VpDNpDK7lf7drD+Y6TSLaOazUoVBgGA6 140tjdno0cbc83uJUCx4qayKTpGlY3xMDdVFMSQugd8TCXE4ixVmz5HsYIQZlLG/v/tF fdjw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:subject:to:from:cc:date:message-id:user-agent :mime-version:content-type:content-transfer-encoding; bh=+/ugzc2QSep5Hm2w9wSMaONBCWQA1p0LtMOhX8qS8LU=; b=QgP1KUemJnKvPzkx2n5XdaZ/j1HJcRvmazkwFWO8SZBeVGQuTyJM2kc8M5/y4Gk3Sb zCXN2HKX21Ed3sgmAfwzOclt+3UTy7j9vu99SwxxVTeE2j+O9r/aOViYRVEQjhuNdyHN taTrsgP6NwfGNKAsoRnyENyS1Ftt7qc4YYrCc/Fn4LoPguEnEWnEHV2U5OlK1U++2dNI czWNe4JGkrTp8cMGPays8TcsMKypW1bMugZMWCe8VesrBmSRK77WKKMxwPn4EaPcAiTd 2U2+7TIB9lo+PQid5LUTeJe8sONMtDMKPmHb4eq5G+JuoiRr28+1K38NrLhCcYibhK7M VUCg== X-Gm-Message-State: ALoCoQkXdBVijgLKbRpKp6h7FvD1oRQymHaNNQdgWQp6+hCyGWzNJaFdaJCW/ri1mtHwT9Z/fxqj X-Received: by 10.50.225.35 with SMTP id rh3mr6623738igc.29.1434140639694; Fri, 12 Jun 2015 13:23:59 -0700 (PDT) Received: from localhost ([69.71.1.1]) by mx.google.com with ESMTPSA id r4sm1860867igh.9.2015.06.12.13.23.58 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 12 Jun 2015 13:23:59 -0700 (PDT) Subject: [PATCH] PCI: imx6: Use "u32", not "uint32_t" To: Richard Zhu , Lucas Stach From: Bjorn Helgaas Date: Fri, 12 Jun 2015 15:23:57 -0500 Message-ID: <20150612202357.17586.99216.stgit@bhelgaas-glaptop2.roam.corp.google.com> User-Agent: StGit/0.16 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150612_132422_846462_359641AF X-CRM114-Status: UNSURE ( 9.86 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.8 (/) Cc: Marek Vasut , linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Troy Kisky X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,RCVD_IN_DNSWL_MED,T_DKIM_INVALID,T_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 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(-) 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); - 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)