From: Krzysztof Kozlowski <krzk@kernel.org>
To: Bjorn Helgaas <bhelgaas@google.com>
Cc: Jingoo Han <jingoohan1@gmail.com>,
Krzysztof Kozlowski <k.kozlowski@samsung.com>,
Kukjin Kim <kgene@kernel.org>,
linux-pci@vger.kernel.org, linux-samsung-soc@vger.kernel.org
Subject: Re: [PATCH 1/8] PCI: exynos: Name private struct pointer "exynos" consistently
Date: Sat, 8 Oct 2016 22:41:44 +0300 [thread overview]
Message-ID: <20161008194144.GA2991@kozik-lap> (raw)
In-Reply-To: <20161007163526.25314.29033.stgit@bhelgaas-glaptop2.roam.corp.google.com>
On Fri, Oct 07, 2016 at 11:35:26AM -0500, Bjorn Helgaas wrote:
> Use a device-specific name, "exynos", for struct exynos_pcie pointers
> to hint that this is device-specific information.
I don't get it. "exynos_pcie" is already a exynos-device-specific name.
There are a lot of changes but I don't see the real reason/benefit. What
was your intention?
> No functional change
> intended.
Oh, but there is. Inline disappeared in first functions. Although I
don't mind but this should be seprate from trivial rename.
Best regards,
Krzysztof
>
> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
> ---
> drivers/pci/host/pci-exynos.c | 272 ++++++++++++++++++++---------------------
> 1 file changed, 135 insertions(+), 137 deletions(-)
>
> diff --git a/drivers/pci/host/pci-exynos.c b/drivers/pci/host/pci-exynos.c
> index f559b49..05eb246 100644
> --- a/drivers/pci/host/pci-exynos.c
> +++ b/drivers/pci/host/pci-exynos.c
> @@ -102,221 +102,221 @@ struct exynos_pcie {
> #define PCIE_PHY_TRSV3_PD_TSV (0x1 << 7)
> #define PCIE_PHY_TRSV3_LVCC 0x31c
>
> -static inline void exynos_elb_writel(struct exynos_pcie *pcie, u32 val, u32 reg)
> +static void exynos_elb_writel(struct exynos_pcie *exynos, u32 val, u32 reg)
> {
> - writel(val, pcie->elbi_base + reg);
> + writel(val, exynos->elbi_base + reg);
> }
>
> -static inline u32 exynos_elb_readl(struct exynos_pcie *pcie, u32 reg)
> +static u32 exynos_elb_readl(struct exynos_pcie *exynos, u32 reg)
> {
> - return readl(pcie->elbi_base + reg);
> + return readl(exynos->elbi_base + reg);
> }
>
> -static inline void exynos_phy_writel(struct exynos_pcie *pcie, u32 val, u32 reg)
> +static void exynos_phy_writel(struct exynos_pcie *exynos, u32 val, u32 reg)
> {
> - writel(val, pcie->phy_base + reg);
> + writel(val, exynos->phy_base + reg);
> }
>
> -static inline u32 exynos_phy_readl(struct exynos_pcie *pcie, u32 reg)
> +static u32 exynos_phy_readl(struct exynos_pcie *exynos, u32 reg)
> {
> - return readl(pcie->phy_base + reg);
> + return readl(exynos->phy_base + reg);
> }
>
> -static inline void exynos_blk_writel(struct exynos_pcie *pcie, u32 val, u32 reg)
> +static void exynos_blk_writel(struct exynos_pcie *exynos, u32 val, u32 reg)
> {
> - writel(val, pcie->block_base + reg);
> + writel(val, exynos->block_base + reg);
> }
>
> -static inline u32 exynos_blk_readl(struct exynos_pcie *pcie, u32 reg)
> +static u32 exynos_blk_readl(struct exynos_pcie *exynos, u32 reg)
> {
> - return readl(pcie->block_base + reg);
> + return readl(exynos->block_base + reg);
> }
>
> static void exynos_pcie_sideband_dbi_w_mode(struct pcie_port *pp, bool on)
> {
> u32 val;
> - struct exynos_pcie *exynos_pcie = to_exynos_pcie(pp);
> + struct exynos_pcie *exynos = to_exynos_pcie(pp);
>
> if (on) {
> - val = exynos_elb_readl(exynos_pcie, PCIE_ELBI_SLV_AWMISC);
> + val = exynos_elb_readl(exynos, PCIE_ELBI_SLV_AWMISC);
> val |= PCIE_ELBI_SLV_DBI_ENABLE;
> - exynos_elb_writel(exynos_pcie, val, PCIE_ELBI_SLV_AWMISC);
> + exynos_elb_writel(exynos, val, PCIE_ELBI_SLV_AWMISC);
> } else {
> - val = exynos_elb_readl(exynos_pcie, PCIE_ELBI_SLV_AWMISC);
> + val = exynos_elb_readl(exynos, PCIE_ELBI_SLV_AWMISC);
> val &= ~PCIE_ELBI_SLV_DBI_ENABLE;
> - exynos_elb_writel(exynos_pcie, val, PCIE_ELBI_SLV_AWMISC);
> + exynos_elb_writel(exynos, val, PCIE_ELBI_SLV_AWMISC);
> }
> }
>
> static void exynos_pcie_sideband_dbi_r_mode(struct pcie_port *pp, bool on)
> {
> u32 val;
> - struct exynos_pcie *exynos_pcie = to_exynos_pcie(pp);
> + struct exynos_pcie *exynos = to_exynos_pcie(pp);
>
> if (on) {
> - val = exynos_elb_readl(exynos_pcie, PCIE_ELBI_SLV_ARMISC);
> + val = exynos_elb_readl(exynos, PCIE_ELBI_SLV_ARMISC);
> val |= PCIE_ELBI_SLV_DBI_ENABLE;
> - exynos_elb_writel(exynos_pcie, val, PCIE_ELBI_SLV_ARMISC);
> + exynos_elb_writel(exynos, val, PCIE_ELBI_SLV_ARMISC);
> } else {
> - val = exynos_elb_readl(exynos_pcie, PCIE_ELBI_SLV_ARMISC);
> + val = exynos_elb_readl(exynos, PCIE_ELBI_SLV_ARMISC);
> val &= ~PCIE_ELBI_SLV_DBI_ENABLE;
> - exynos_elb_writel(exynos_pcie, val, PCIE_ELBI_SLV_ARMISC);
> + exynos_elb_writel(exynos, val, PCIE_ELBI_SLV_ARMISC);
> }
> }
>
> static void exynos_pcie_assert_core_reset(struct pcie_port *pp)
> {
> u32 val;
> - struct exynos_pcie *exynos_pcie = to_exynos_pcie(pp);
> + struct exynos_pcie *exynos = to_exynos_pcie(pp);
>
> - val = exynos_elb_readl(exynos_pcie, PCIE_CORE_RESET);
> + val = exynos_elb_readl(exynos, PCIE_CORE_RESET);
> val &= ~PCIE_CORE_RESET_ENABLE;
> - exynos_elb_writel(exynos_pcie, val, PCIE_CORE_RESET);
> - exynos_elb_writel(exynos_pcie, 0, PCIE_PWR_RESET);
> - exynos_elb_writel(exynos_pcie, 0, PCIE_STICKY_RESET);
> - exynos_elb_writel(exynos_pcie, 0, PCIE_NONSTICKY_RESET);
> + exynos_elb_writel(exynos, val, PCIE_CORE_RESET);
> + exynos_elb_writel(exynos, 0, PCIE_PWR_RESET);
> + exynos_elb_writel(exynos, 0, PCIE_STICKY_RESET);
> + exynos_elb_writel(exynos, 0, PCIE_NONSTICKY_RESET);
> }
>
> static void exynos_pcie_deassert_core_reset(struct pcie_port *pp)
> {
> u32 val;
> - struct exynos_pcie *exynos_pcie = to_exynos_pcie(pp);
> + struct exynos_pcie *exynos = to_exynos_pcie(pp);
>
> - val = exynos_elb_readl(exynos_pcie, PCIE_CORE_RESET);
> + val = exynos_elb_readl(exynos, PCIE_CORE_RESET);
> val |= PCIE_CORE_RESET_ENABLE;
>
> - exynos_elb_writel(exynos_pcie, val, PCIE_CORE_RESET);
> - exynos_elb_writel(exynos_pcie, 1, PCIE_STICKY_RESET);
> - exynos_elb_writel(exynos_pcie, 1, PCIE_NONSTICKY_RESET);
> - exynos_elb_writel(exynos_pcie, 1, PCIE_APP_INIT_RESET);
> - exynos_elb_writel(exynos_pcie, 0, PCIE_APP_INIT_RESET);
> - exynos_blk_writel(exynos_pcie, 1, PCIE_PHY_MAC_RESET);
> + exynos_elb_writel(exynos, val, PCIE_CORE_RESET);
> + exynos_elb_writel(exynos, 1, PCIE_STICKY_RESET);
> + exynos_elb_writel(exynos, 1, PCIE_NONSTICKY_RESET);
> + exynos_elb_writel(exynos, 1, PCIE_APP_INIT_RESET);
> + exynos_elb_writel(exynos, 0, PCIE_APP_INIT_RESET);
> + exynos_blk_writel(exynos, 1, PCIE_PHY_MAC_RESET);
> }
>
> static void exynos_pcie_assert_phy_reset(struct pcie_port *pp)
> {
> - struct exynos_pcie *exynos_pcie = to_exynos_pcie(pp);
> + struct exynos_pcie *exynos = to_exynos_pcie(pp);
>
> - exynos_blk_writel(exynos_pcie, 0, PCIE_PHY_MAC_RESET);
> - exynos_blk_writel(exynos_pcie, 1, PCIE_PHY_GLOBAL_RESET);
> + exynos_blk_writel(exynos, 0, PCIE_PHY_MAC_RESET);
> + exynos_blk_writel(exynos, 1, PCIE_PHY_GLOBAL_RESET);
> }
>
> static void exynos_pcie_deassert_phy_reset(struct pcie_port *pp)
> {
> - struct exynos_pcie *exynos_pcie = to_exynos_pcie(pp);
> + struct exynos_pcie *exynos = to_exynos_pcie(pp);
>
> - exynos_blk_writel(exynos_pcie, 0, PCIE_PHY_GLOBAL_RESET);
> - exynos_elb_writel(exynos_pcie, 1, PCIE_PWR_RESET);
> - exynos_blk_writel(exynos_pcie, 0, PCIE_PHY_COMMON_RESET);
> - exynos_blk_writel(exynos_pcie, 0, PCIE_PHY_CMN_REG);
> - exynos_blk_writel(exynos_pcie, 0, PCIE_PHY_TRSVREG_RESET);
> - exynos_blk_writel(exynos_pcie, 0, PCIE_PHY_TRSV_RESET);
> + exynos_blk_writel(exynos, 0, PCIE_PHY_GLOBAL_RESET);
> + exynos_elb_writel(exynos, 1, PCIE_PWR_RESET);
> + 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);
> }
>
> static void exynos_pcie_power_on_phy(struct pcie_port *pp)
> {
> u32 val;
> - struct exynos_pcie *exynos_pcie = to_exynos_pcie(pp);
> + struct exynos_pcie *exynos = to_exynos_pcie(pp);
>
> - val = exynos_phy_readl(exynos_pcie, PCIE_PHY_COMMON_POWER);
> + val = exynos_phy_readl(exynos, PCIE_PHY_COMMON_POWER);
> val &= ~PCIE_PHY_COMMON_PD_CMN;
> - exynos_phy_writel(exynos_pcie, val, PCIE_PHY_COMMON_POWER);
> + exynos_phy_writel(exynos, val, PCIE_PHY_COMMON_POWER);
>
> - val = exynos_phy_readl(exynos_pcie, PCIE_PHY_TRSV0_POWER);
> + val = exynos_phy_readl(exynos, PCIE_PHY_TRSV0_POWER);
> val &= ~PCIE_PHY_TRSV0_PD_TSV;
> - exynos_phy_writel(exynos_pcie, val, PCIE_PHY_TRSV0_POWER);
> + exynos_phy_writel(exynos, val, PCIE_PHY_TRSV0_POWER);
>
> - val = exynos_phy_readl(exynos_pcie, PCIE_PHY_TRSV1_POWER);
> + val = exynos_phy_readl(exynos, PCIE_PHY_TRSV1_POWER);
> val &= ~PCIE_PHY_TRSV1_PD_TSV;
> - exynos_phy_writel(exynos_pcie, val, PCIE_PHY_TRSV1_POWER);
> + exynos_phy_writel(exynos, val, PCIE_PHY_TRSV1_POWER);
>
> - val = exynos_phy_readl(exynos_pcie, PCIE_PHY_TRSV2_POWER);
> + val = exynos_phy_readl(exynos, PCIE_PHY_TRSV2_POWER);
> val &= ~PCIE_PHY_TRSV2_PD_TSV;
> - exynos_phy_writel(exynos_pcie, val, PCIE_PHY_TRSV2_POWER);
> + exynos_phy_writel(exynos, val, PCIE_PHY_TRSV2_POWER);
>
> - val = exynos_phy_readl(exynos_pcie, PCIE_PHY_TRSV3_POWER);
> + val = exynos_phy_readl(exynos, PCIE_PHY_TRSV3_POWER);
> val &= ~PCIE_PHY_TRSV3_PD_TSV;
> - exynos_phy_writel(exynos_pcie, val, PCIE_PHY_TRSV3_POWER);
> + exynos_phy_writel(exynos, val, PCIE_PHY_TRSV3_POWER);
> }
>
> static void exynos_pcie_power_off_phy(struct pcie_port *pp)
> {
> u32 val;
> - struct exynos_pcie *exynos_pcie = to_exynos_pcie(pp);
> + struct exynos_pcie *exynos = to_exynos_pcie(pp);
>
> - val = exynos_phy_readl(exynos_pcie, PCIE_PHY_COMMON_POWER);
> + val = exynos_phy_readl(exynos, PCIE_PHY_COMMON_POWER);
> val |= PCIE_PHY_COMMON_PD_CMN;
> - exynos_phy_writel(exynos_pcie, val, PCIE_PHY_COMMON_POWER);
> + exynos_phy_writel(exynos, val, PCIE_PHY_COMMON_POWER);
>
> - val = exynos_phy_readl(exynos_pcie, PCIE_PHY_TRSV0_POWER);
> + val = exynos_phy_readl(exynos, PCIE_PHY_TRSV0_POWER);
> val |= PCIE_PHY_TRSV0_PD_TSV;
> - exynos_phy_writel(exynos_pcie, val, PCIE_PHY_TRSV0_POWER);
> + exynos_phy_writel(exynos, val, PCIE_PHY_TRSV0_POWER);
>
> - val = exynos_phy_readl(exynos_pcie, PCIE_PHY_TRSV1_POWER);
> + val = exynos_phy_readl(exynos, PCIE_PHY_TRSV1_POWER);
> val |= PCIE_PHY_TRSV1_PD_TSV;
> - exynos_phy_writel(exynos_pcie, val, PCIE_PHY_TRSV1_POWER);
> + exynos_phy_writel(exynos, val, PCIE_PHY_TRSV1_POWER);
>
> - val = exynos_phy_readl(exynos_pcie, PCIE_PHY_TRSV2_POWER);
> + val = exynos_phy_readl(exynos, PCIE_PHY_TRSV2_POWER);
> val |= PCIE_PHY_TRSV2_PD_TSV;
> - exynos_phy_writel(exynos_pcie, val, PCIE_PHY_TRSV2_POWER);
> + exynos_phy_writel(exynos, val, PCIE_PHY_TRSV2_POWER);
>
> - val = exynos_phy_readl(exynos_pcie, PCIE_PHY_TRSV3_POWER);
> + val = exynos_phy_readl(exynos, PCIE_PHY_TRSV3_POWER);
> val |= PCIE_PHY_TRSV3_PD_TSV;
> - exynos_phy_writel(exynos_pcie, val, PCIE_PHY_TRSV3_POWER);
> + exynos_phy_writel(exynos, val, PCIE_PHY_TRSV3_POWER);
> }
>
> static void exynos_pcie_init_phy(struct pcie_port *pp)
> {
> - struct exynos_pcie *exynos_pcie = to_exynos_pcie(pp);
> + struct exynos_pcie *exynos = to_exynos_pcie(pp);
>
> /* DCC feedback control off */
> - exynos_phy_writel(exynos_pcie, 0x29, PCIE_PHY_DCC_FEEDBACK);
> + exynos_phy_writel(exynos, 0x29, PCIE_PHY_DCC_FEEDBACK);
>
> /* set TX/RX impedance */
> - exynos_phy_writel(exynos_pcie, 0xd5, PCIE_PHY_IMPEDANCE);
> + exynos_phy_writel(exynos, 0xd5, PCIE_PHY_IMPEDANCE);
>
> /* set 50Mhz PHY clock */
> - exynos_phy_writel(exynos_pcie, 0x14, PCIE_PHY_PLL_DIV_0);
> - exynos_phy_writel(exynos_pcie, 0x12, PCIE_PHY_PLL_DIV_1);
> + exynos_phy_writel(exynos, 0x14, PCIE_PHY_PLL_DIV_0);
> + exynos_phy_writel(exynos, 0x12, PCIE_PHY_PLL_DIV_1);
>
> /* set TX Differential output for lane 0 */
> - exynos_phy_writel(exynos_pcie, 0x7f, PCIE_PHY_TRSV0_DRV_LVL);
> + exynos_phy_writel(exynos, 0x7f, PCIE_PHY_TRSV0_DRV_LVL);
>
> /* set TX Pre-emphasis Level Control for lane 0 to minimum */
> - exynos_phy_writel(exynos_pcie, 0x0, PCIE_PHY_TRSV0_EMP_LVL);
> + exynos_phy_writel(exynos, 0x0, PCIE_PHY_TRSV0_EMP_LVL);
>
> /* set RX clock and data recovery bandwidth */
> - exynos_phy_writel(exynos_pcie, 0xe7, PCIE_PHY_PLL_BIAS);
> - exynos_phy_writel(exynos_pcie, 0x82, PCIE_PHY_TRSV0_RXCDR);
> - exynos_phy_writel(exynos_pcie, 0x82, PCIE_PHY_TRSV1_RXCDR);
> - exynos_phy_writel(exynos_pcie, 0x82, PCIE_PHY_TRSV2_RXCDR);
> - exynos_phy_writel(exynos_pcie, 0x82, PCIE_PHY_TRSV3_RXCDR);
> + exynos_phy_writel(exynos, 0xe7, PCIE_PHY_PLL_BIAS);
> + exynos_phy_writel(exynos, 0x82, PCIE_PHY_TRSV0_RXCDR);
> + exynos_phy_writel(exynos, 0x82, PCIE_PHY_TRSV1_RXCDR);
> + exynos_phy_writel(exynos, 0x82, PCIE_PHY_TRSV2_RXCDR);
> + exynos_phy_writel(exynos, 0x82, PCIE_PHY_TRSV3_RXCDR);
>
> /* change TX Pre-emphasis Level Control for lanes */
> - exynos_phy_writel(exynos_pcie, 0x39, PCIE_PHY_TRSV0_EMP_LVL);
> - exynos_phy_writel(exynos_pcie, 0x39, PCIE_PHY_TRSV1_EMP_LVL);
> - exynos_phy_writel(exynos_pcie, 0x39, PCIE_PHY_TRSV2_EMP_LVL);
> - exynos_phy_writel(exynos_pcie, 0x39, PCIE_PHY_TRSV3_EMP_LVL);
> + exynos_phy_writel(exynos, 0x39, PCIE_PHY_TRSV0_EMP_LVL);
> + exynos_phy_writel(exynos, 0x39, PCIE_PHY_TRSV1_EMP_LVL);
> + exynos_phy_writel(exynos, 0x39, PCIE_PHY_TRSV2_EMP_LVL);
> + exynos_phy_writel(exynos, 0x39, PCIE_PHY_TRSV3_EMP_LVL);
>
> /* set LVCC */
> - exynos_phy_writel(exynos_pcie, 0x20, PCIE_PHY_TRSV0_LVCC);
> - exynos_phy_writel(exynos_pcie, 0xa0, PCIE_PHY_TRSV1_LVCC);
> - exynos_phy_writel(exynos_pcie, 0xa0, PCIE_PHY_TRSV2_LVCC);
> - exynos_phy_writel(exynos_pcie, 0xa0, PCIE_PHY_TRSV3_LVCC);
> + exynos_phy_writel(exynos, 0x20, PCIE_PHY_TRSV0_LVCC);
> + exynos_phy_writel(exynos, 0xa0, PCIE_PHY_TRSV1_LVCC);
> + exynos_phy_writel(exynos, 0xa0, PCIE_PHY_TRSV2_LVCC);
> + exynos_phy_writel(exynos, 0xa0, PCIE_PHY_TRSV3_LVCC);
> }
>
> static void exynos_pcie_assert_reset(struct pcie_port *pp)
> {
> - struct exynos_pcie *exynos_pcie = to_exynos_pcie(pp);
> + struct exynos_pcie *exynos = to_exynos_pcie(pp);
>
> - if (exynos_pcie->reset_gpio >= 0)
> - devm_gpio_request_one(pp->dev, exynos_pcie->reset_gpio,
> + if (exynos->reset_gpio >= 0)
> + devm_gpio_request_one(pp->dev, exynos->reset_gpio,
> GPIOF_OUT_INIT_HIGH, "RESET");
> }
>
> static int exynos_pcie_establish_link(struct pcie_port *pp)
> {
> - struct exynos_pcie *exynos_pcie = to_exynos_pcie(pp);
> + struct exynos_pcie *exynos = to_exynos_pcie(pp);
> u32 val;
>
> if (dw_pcie_link_up(pp)) {
> @@ -338,9 +338,9 @@ static int exynos_pcie_establish_link(struct pcie_port *pp)
> exynos_pcie_init_phy(pp);
>
> /* pulse for common reset */
> - exynos_blk_writel(exynos_pcie, 1, PCIE_PHY_COMMON_RESET);
> + exynos_blk_writel(exynos, 1, PCIE_PHY_COMMON_RESET);
> udelay(500);
> - exynos_blk_writel(exynos_pcie, 0, PCIE_PHY_COMMON_RESET);
> + exynos_blk_writel(exynos, 0, PCIE_PHY_COMMON_RESET);
>
> /* de-assert core reset */
> exynos_pcie_deassert_core_reset(pp);
> @@ -352,15 +352,15 @@ static int exynos_pcie_establish_link(struct pcie_port *pp)
> exynos_pcie_assert_reset(pp);
>
> /* assert LTSSM enable */
> - exynos_elb_writel(exynos_pcie, PCIE_ELBI_LTSSM_ENABLE,
> + exynos_elb_writel(exynos, PCIE_ELBI_LTSSM_ENABLE,
> PCIE_APP_LTSSM_ENABLE);
>
> /* check if the link is up or not */
> if (!dw_pcie_wait_for_link(pp))
> return 0;
>
> - while (exynos_phy_readl(exynos_pcie, PCIE_PHY_PLL_LOCKED) == 0) {
> - val = exynos_blk_readl(exynos_pcie, PCIE_PHY_PLL_LOCKED);
> + while (exynos_phy_readl(exynos, PCIE_PHY_PLL_LOCKED) == 0) {
> + val = exynos_blk_readl(exynos, PCIE_PHY_PLL_LOCKED);
> dev_info(pp->dev, "PLL Locked: 0x%x\n", val);
> }
> /* power off phy */
> @@ -372,21 +372,21 @@ static int exynos_pcie_establish_link(struct pcie_port *pp)
> static void exynos_pcie_clear_irq_pulse(struct pcie_port *pp)
> {
> u32 val;
> - struct exynos_pcie *exynos_pcie = to_exynos_pcie(pp);
> + struct exynos_pcie *exynos = to_exynos_pcie(pp);
>
> - val = exynos_elb_readl(exynos_pcie, PCIE_IRQ_PULSE);
> - exynos_elb_writel(exynos_pcie, val, PCIE_IRQ_PULSE);
> + val = exynos_elb_readl(exynos, PCIE_IRQ_PULSE);
> + exynos_elb_writel(exynos, val, PCIE_IRQ_PULSE);
> }
>
> static void exynos_pcie_enable_irq_pulse(struct pcie_port *pp)
> {
> u32 val;
> - struct exynos_pcie *exynos_pcie = to_exynos_pcie(pp);
> + struct exynos_pcie *exynos = to_exynos_pcie(pp);
>
> /* enable INTX interrupt */
> val = IRQ_INTA_ASSERT | IRQ_INTB_ASSERT |
> IRQ_INTC_ASSERT | IRQ_INTD_ASSERT;
> - exynos_elb_writel(exynos_pcie, val, PCIE_IRQ_EN_PULSE);
> + exynos_elb_writel(exynos, val, PCIE_IRQ_EN_PULSE);
> }
>
> static irqreturn_t exynos_pcie_irq_handler(int irq, void *arg)
> @@ -407,14 +407,14 @@ static irqreturn_t exynos_pcie_msi_irq_handler(int irq, void *arg)
> static void exynos_pcie_msi_init(struct pcie_port *pp)
> {
> u32 val;
> - struct exynos_pcie *exynos_pcie = to_exynos_pcie(pp);
> + struct exynos_pcie *exynos = to_exynos_pcie(pp);
>
> dw_pcie_msi_init(pp);
>
> /* enable MSI interrupt */
> - val = exynos_elb_readl(exynos_pcie, PCIE_IRQ_EN_LEVEL);
> + val = exynos_elb_readl(exynos, PCIE_IRQ_EN_LEVEL);
> val |= IRQ_MSI_ENABLE;
> - exynos_elb_writel(exynos_pcie, val, PCIE_IRQ_EN_LEVEL);
> + exynos_elb_writel(exynos, val, PCIE_IRQ_EN_LEVEL);
> }
>
> static void exynos_pcie_enable_interrupts(struct pcie_port *pp)
> @@ -466,8 +466,8 @@ static int exynos_pcie_wr_own_conf(struct pcie_port *pp, int where, int size,
>
> static int exynos_pcie_link_up(struct pcie_port *pp)
> {
> - struct exynos_pcie *exynos_pcie = to_exynos_pcie(pp);
> - u32 val = exynos_elb_readl(exynos_pcie, PCIE_ELBI_RDLH_LINKUP);
> + struct exynos_pcie *exynos = to_exynos_pcie(pp);
> + u32 val = exynos_elb_readl(exynos, PCIE_ELBI_RDLH_LINKUP);
>
> if (val == PCIE_ELBI_LTSSM_ENABLE)
> return 1;
> @@ -538,7 +538,7 @@ static int __init exynos_add_pcie_port(struct pcie_port *pp,
>
> static int __init exynos_pcie_probe(struct platform_device *pdev)
> {
> - struct exynos_pcie *exynos_pcie;
> + struct exynos_pcie *exynos;
> struct pcie_port *pp;
> struct device_node *np = pdev->dev.of_node;
> struct resource *elbi_base;
> @@ -546,54 +546,52 @@ static int __init exynos_pcie_probe(struct platform_device *pdev)
> struct resource *block_base;
> int ret;
>
> - exynos_pcie = devm_kzalloc(&pdev->dev, sizeof(*exynos_pcie),
> - GFP_KERNEL);
> - if (!exynos_pcie)
> + exynos = devm_kzalloc(&pdev->dev, sizeof(*exynos), GFP_KERNEL);
> + if (!exynos)
> return -ENOMEM;
>
> - pp = &exynos_pcie->pp;
> -
> + pp = &exynos->pp;
> pp->dev = &pdev->dev;
>
> - exynos_pcie->reset_gpio = of_get_named_gpio(np, "reset-gpio", 0);
> + exynos->reset_gpio = of_get_named_gpio(np, "reset-gpio", 0);
>
> - exynos_pcie->clk = devm_clk_get(&pdev->dev, "pcie");
> - if (IS_ERR(exynos_pcie->clk)) {
> + exynos->clk = devm_clk_get(&pdev->dev, "pcie");
> + if (IS_ERR(exynos->clk)) {
> dev_err(&pdev->dev, "Failed to get pcie rc clock\n");
> - return PTR_ERR(exynos_pcie->clk);
> + return PTR_ERR(exynos->clk);
> }
> - ret = clk_prepare_enable(exynos_pcie->clk);
> + ret = clk_prepare_enable(exynos->clk);
> if (ret)
> return ret;
>
> - exynos_pcie->bus_clk = devm_clk_get(&pdev->dev, "pcie_bus");
> - if (IS_ERR(exynos_pcie->bus_clk)) {
> + exynos->bus_clk = devm_clk_get(&pdev->dev, "pcie_bus");
> + if (IS_ERR(exynos->bus_clk)) {
> dev_err(&pdev->dev, "Failed to get pcie bus clock\n");
> - ret = PTR_ERR(exynos_pcie->bus_clk);
> + ret = PTR_ERR(exynos->bus_clk);
> goto fail_clk;
> }
> - ret = clk_prepare_enable(exynos_pcie->bus_clk);
> + ret = clk_prepare_enable(exynos->bus_clk);
> if (ret)
> goto fail_clk;
>
> elbi_base = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> - exynos_pcie->elbi_base = devm_ioremap_resource(&pdev->dev, elbi_base);
> - if (IS_ERR(exynos_pcie->elbi_base)) {
> - ret = PTR_ERR(exynos_pcie->elbi_base);
> + exynos->elbi_base = devm_ioremap_resource(&pdev->dev, elbi_base);
> + if (IS_ERR(exynos->elbi_base)) {
> + ret = PTR_ERR(exynos->elbi_base);
> goto fail_bus_clk;
> }
>
> phy_base = platform_get_resource(pdev, IORESOURCE_MEM, 1);
> - exynos_pcie->phy_base = devm_ioremap_resource(&pdev->dev, phy_base);
> - if (IS_ERR(exynos_pcie->phy_base)) {
> - ret = PTR_ERR(exynos_pcie->phy_base);
> + exynos->phy_base = devm_ioremap_resource(&pdev->dev, phy_base);
> + if (IS_ERR(exynos->phy_base)) {
> + ret = PTR_ERR(exynos->phy_base);
> goto fail_bus_clk;
> }
>
> block_base = platform_get_resource(pdev, IORESOURCE_MEM, 2);
> - exynos_pcie->block_base = devm_ioremap_resource(&pdev->dev, block_base);
> - if (IS_ERR(exynos_pcie->block_base)) {
> - ret = PTR_ERR(exynos_pcie->block_base);
> + exynos->block_base = devm_ioremap_resource(&pdev->dev, block_base);
> + if (IS_ERR(exynos->block_base)) {
> + ret = PTR_ERR(exynos->block_base);
> goto fail_bus_clk;
> }
>
> @@ -601,22 +599,22 @@ static int __init exynos_pcie_probe(struct platform_device *pdev)
> if (ret < 0)
> goto fail_bus_clk;
>
> - platform_set_drvdata(pdev, exynos_pcie);
> + platform_set_drvdata(pdev, exynos);
> return 0;
>
> fail_bus_clk:
> - clk_disable_unprepare(exynos_pcie->bus_clk);
> + clk_disable_unprepare(exynos->bus_clk);
> fail_clk:
> - clk_disable_unprepare(exynos_pcie->clk);
> + clk_disable_unprepare(exynos->clk);
> return ret;
> }
>
> static int __exit exynos_pcie_remove(struct platform_device *pdev)
> {
> - struct exynos_pcie *exynos_pcie = platform_get_drvdata(pdev);
> + struct exynos_pcie *exynos = platform_get_drvdata(pdev);
>
> - clk_disable_unprepare(exynos_pcie->bus_clk);
> - clk_disable_unprepare(exynos_pcie->clk);
> + clk_disable_unprepare(exynos->bus_clk);
> + clk_disable_unprepare(exynos->clk);
>
> return 0;
> }
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2016-10-08 19:41 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-07 16:35 [PATCH 1/8] PCI: exynos: Name private struct pointer "exynos" consistently Bjorn Helgaas
2016-10-07 16:35 ` [PATCH 2/8] PCI: exynos: Pass device-specific struct to internal functions Bjorn Helgaas
2016-10-07 16:35 ` [PATCH 3/8] PCI: exynos: Reorder struct exynos_pcie Bjorn Helgaas
2016-10-07 16:35 ` [PATCH 4/8] PCI: exynos: Reorder accessor functions Bjorn Helgaas
2016-10-07 16:36 ` [PATCH 5/8] PCI: exynos: Swap order of exynos_elb_writel() reg/val arguments Bjorn Helgaas
2016-10-07 16:36 ` [PATCH 6/8] PCI: exynos: Swap order of exynos_phy_writel() " Bjorn Helgaas
2016-10-07 16:36 ` [PATCH 7/8] PCI: exynos: Swap order of exynos_blk_writel() " Bjorn Helgaas
2016-10-07 16:36 ` [PATCH 8/8] PCI: exynos: Add local struct device pointers Bjorn Helgaas
2016-10-08 19:41 ` Krzysztof Kozlowski [this message]
2016-10-10 13:36 ` [PATCH 1/8] PCI: exynos: Name private struct pointer "exynos" consistently Bjorn Helgaas
2016-10-10 16:49 ` Krzysztof Kozlowski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20161008194144.GA2991@kozik-lap \
--to=krzk@kernel.org \
--cc=bhelgaas@google.com \
--cc=jingoohan1@gmail.com \
--cc=k.kozlowski@samsung.com \
--cc=kgene@kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=linux-samsung-soc@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).