aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2015-06-12 16:02:49 -0400
committerBjorn Helgaas <bhelgaas@google.com>2015-06-16 09:18:18 -0400
commit1c7fae18a1fb6b6bcd6669066ee801769de0e943 (patch)
tree338a78d83edc4bb9bbf46d6de231202319a37605
parenta0427464cf4c4ae80aaa16dbcefc39ba9a5e258b (diff)
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 <bhelgaas@google.com> Acked-by: Richard Zhu <Richard.Zhu@freescale.com>
-rw-r--r--drivers/pci/host/pci-imx6.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/pci/host/pci-imx6.c b/drivers/pci/host/pci-imx6.c
index c93bcdf58a56..776789f0ebe0 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)
354 354
355static int imx6_pcie_wait_for_speed_change(struct pcie_port *pp) 355static int imx6_pcie_wait_for_speed_change(struct pcie_port *pp)
356{ 356{
357 uint32_t tmp; 357 u32 tmp;
358 unsigned int retries; 358 unsigned int retries;
359 359
360 for (retries = 0; retries < 200; retries++) { 360 for (retries = 0; retries < 200; retries++) {
@@ -379,7 +379,7 @@ static irqreturn_t imx6_pcie_msi_handler(int irq, void *arg)
379static int imx6_pcie_start_link(struct pcie_port *pp) 379static int imx6_pcie_start_link(struct pcie_port *pp)
380{ 380{
381 struct imx6_pcie *imx6_pcie = to_imx6_pcie(pp); 381 struct imx6_pcie *imx6_pcie = to_imx6_pcie(pp);
382 uint32_t tmp; 382 u32 tmp;
383 int ret; 383 int ret;
384 384
385 /* 385 /*
@@ -450,19 +450,19 @@ static void imx6_pcie_host_init(struct pcie_port *pp)
450 450
451static void imx6_pcie_reset_phy(struct pcie_port *pp) 451static void imx6_pcie_reset_phy(struct pcie_port *pp)
452{ 452{
453 uint32_t temp; 453 u32 tmp;
454 454
455 pcie_phy_read(pp->dbi_base, PHY_RX_OVRD_IN_LO, &temp); 455 pcie_phy_read(pp->dbi_base, PHY_RX_OVRD_IN_LO, &tmp);
456 temp |= (PHY_RX_OVRD_IN_LO_RX_DATA_EN | 456 tmp |= (PHY_RX_OVRD_IN_LO_RX_DATA_EN |
457 PHY_RX_OVRD_IN_LO_RX_PLL_EN); 457 PHY_RX_OVRD_IN_LO_RX_PLL_EN);
458 pcie_phy_write(pp->dbi_base, PHY_RX_OVRD_IN_LO, temp); 458 pcie_phy_write(pp->dbi_base, PHY_RX_OVRD_IN_LO, tmp);
459 459
460 usleep_range(2000, 3000); 460 usleep_range(2000, 3000);
461 461
462 pcie_phy_read(pp->dbi_base, PHY_RX_OVRD_IN_LO, &temp); 462 pcie_phy_read(pp->dbi_base, PHY_RX_OVRD_IN_LO, &tmp);
463 temp &= ~(PHY_RX_OVRD_IN_LO_RX_DATA_EN | 463 tmp &= ~(PHY_RX_OVRD_IN_LO_RX_DATA_EN |
464 PHY_RX_OVRD_IN_LO_RX_PLL_EN); 464 PHY_RX_OVRD_IN_LO_RX_PLL_EN);
465 pcie_phy_write(pp->dbi_base, PHY_RX_OVRD_IN_LO, temp); 465 pcie_phy_write(pp->dbi_base, PHY_RX_OVRD_IN_LO, tmp);
466} 466}
467 467
468static int imx6_pcie_link_up(struct pcie_port *pp) 468static int imx6_pcie_link_up(struct pcie_port *pp)