Swap order of exynos_blk_writel() arguments to match the "dev, pos, val" order used by pci_write_config_word() and other drivers. No functional change intended. Signed-off-by: Bjorn Helgaas <bhelgaas@xxxxxxxxxx> --- drivers/pci/host/pci-exynos.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/drivers/pci/host/pci-exynos.c b/drivers/pci/host/pci-exynos.c index 463cbd6..4fb3ce7 100644 --- a/drivers/pci/host/pci-exynos.c +++ b/drivers/pci/host/pci-exynos.c @@ -127,7 +127,7 @@ static u32 exynos_blk_readl(struct exynos_pcie *exynos, u32 reg) return readl(exynos->block_base + reg); } -static void exynos_blk_writel(struct exynos_pcie *exynos, u32 val, u32 reg) +static void exynos_blk_writel(struct exynos_pcie *exynos, u32 reg, u32 val) { writel(val, exynos->block_base + reg); } @@ -186,23 +186,23 @@ static void exynos_pcie_deassert_core_reset(struct exynos_pcie *exynos) exynos_elb_writel(exynos, PCIE_NONSTICKY_RESET, 1); exynos_elb_writel(exynos, PCIE_APP_INIT_RESET, 1); exynos_elb_writel(exynos, PCIE_APP_INIT_RESET, 0); - exynos_blk_writel(exynos, 1, PCIE_PHY_MAC_RESET); + exynos_blk_writel(exynos, PCIE_PHY_MAC_RESET, 1); } static void exynos_pcie_assert_phy_reset(struct exynos_pcie *exynos) { - exynos_blk_writel(exynos, 0, PCIE_PHY_MAC_RESET); - exynos_blk_writel(exynos, 1, PCIE_PHY_GLOBAL_RESET); + exynos_blk_writel(exynos, PCIE_PHY_MAC_RESET, 0); + exynos_blk_writel(exynos, PCIE_PHY_GLOBAL_RESET, 1); } static void exynos_pcie_deassert_phy_reset(struct exynos_pcie *exynos) { - exynos_blk_writel(exynos, 0, PCIE_PHY_GLOBAL_RESET); + exynos_blk_writel(exynos, PCIE_PHY_GLOBAL_RESET, 0); exynos_elb_writel(exynos, PCIE_PWR_RESET, 1); - exynos_blk_writel(exynos, 0, PCIE_PHY_COMMON_RESET); - exynos_blk_writel(exynos, 0, PCIE_PHY_CMN_REG); - exynos_blk_writel(exynos, 0, PCIE_PHY_TRSVREG_RESET); - exynos_blk_writel(exynos, 0, PCIE_PHY_TRSV_RESET); + exynos_blk_writel(exynos, PCIE_PHY_COMMON_RESET, 0); + exynos_blk_writel(exynos, PCIE_PHY_CMN_REG, 0); + exynos_blk_writel(exynos, PCIE_PHY_TRSVREG_RESET, 0); + exynos_blk_writel(exynos, PCIE_PHY_TRSV_RESET, 0); } static void exynos_pcie_power_on_phy(struct exynos_pcie *exynos) @@ -319,9 +319,9 @@ static int exynos_pcie_establish_link(struct exynos_pcie *exynos) exynos_pcie_init_phy(exynos); /* pulse for common reset */ - exynos_blk_writel(exynos, 1, PCIE_PHY_COMMON_RESET); + exynos_blk_writel(exynos, PCIE_PHY_COMMON_RESET, 1); udelay(500); - exynos_blk_writel(exynos, 0, PCIE_PHY_COMMON_RESET); + exynos_blk_writel(exynos, PCIE_PHY_COMMON_RESET, 0); exynos_pcie_deassert_core_reset(exynos); dw_pcie_setup_rc(pp); -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html