[PATCH 2/2] PCI: rcar-gen4: Inline rcar_gen4_pcie_host_perst_assert() again

[Marek Vasut]

The rcar_gen4_pcie_host_perst_assert() no longer has any purpose,
inline reset_control_assert()/reset_control_deassert() back into
the rest of the code and drop rcar_gen4_pcie_host_perst_assert().

Signed-off-by: Marek Vasut <marek.vasut+renesas@xxxxxxxxxxx>
---
Cc: "Krzysztof Wilczyński" <kwilczynski@xxxxxxxxxx>
Cc: Alex Elder <elder@xxxxxxxxxxxx>
Cc: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx>
Cc: Arnd Bergmann <arnd@xxxxxxxx>
Cc: Bartosz Golaszewski <brgl@xxxxxxxxxx>
Cc: Bjorn Helgaas <bhelgaas@xxxxxxxxxx>
Cc: Frank Li <Frank.Li@xxxxxxx>
Cc: Geert Uytterhoeven <geert+renesas@xxxxxxxxx>
Cc: Jingoo Han <jingoohan1@xxxxxxxxx>
Cc: Koichiro Den <den@xxxxxxxxxxxxx>
Cc: Lorenzo Pieralisi <lpieralisi@xxxxxxxxxx>
Cc: Magnus Damm <magnus.damm@xxxxxxxxx>
Cc: Manivannan Sadhasivam <mani@xxxxxxxxxx>
Cc: Neil Armstrong <neil.armstrong@xxxxxxxxxx>
Cc: Randolph Lin <randolph@xxxxxxxxxxxxx>
Cc: Rob Herring <robh@xxxxxxxxxx>
Cc: Sherry Sun <sherry.sun@xxxxxxx>
Cc: Siddharth Vadapalli <s-vadapalli@xxxxxx>
Cc: Vidya Sagar <vidyas@xxxxxxxxxx>
Cc: Vincent Guittot <vincent.guittot@xxxxxxxxxx>
Cc: Wilfred Mallawa <wilfred.mallawa@xxxxxxx>
Cc: Xincheng Zhang <zhangxincheng@xxxxxxxxxxxxx>
Cc: Yoshihiro Shimoda <yoshihiro.shimoda.uh@xxxxxxxxxxx>
Cc: linux-kernel@xxxxxxxxxxxxxxx
Cc: linux-pci@xxxxxxxxxxxxxxx
Cc: linux-renesas-soc@xxxxxxxxxxxxxxx
---
 drivers/pci/controller/dwc/pcie-rcar-gen4.c | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/drivers/pci/controller/dwc/pcie-rcar-gen4.c b/drivers/pci/controller/dwc/pcie-rcar-gen4.c
index d3bf01485e11d..9a64a9f4ab0d1 100644
--- a/drivers/pci/controller/dwc/pcie-rcar-gen4.c
+++ b/drivers/pci/controller/dwc/pcie-rcar-gen4.c
@@ -652,17 +652,6 @@ static int rcar_gen4_pcie_host_perst_get(struct dw_pcie *dw)
 	return 0;
 }
 
-static void rcar_gen4_pcie_host_perst_assert(struct dw_pcie_rp *pp, bool assert)
-{
-	struct dw_pcie *dw = to_dw_pcie_from_pp(pp);
-	struct rcar_gen4_pcie *rcar = to_rcar_gen4_pcie(dw);
-
-	if (assert)
-		reset_control_assert(rcar->perst);
-	else
-		reset_control_deassert(rcar->perst);
-}
-
 /* Host mode */
 static int rcar_gen4_pcie_host_init(struct dw_pcie_rp *pp)
 {
@@ -677,7 +666,7 @@ static int rcar_gen4_pcie_host_init(struct dw_pcie_rp *pp)
 	if (pp->bridge)
 		pp->bridge->enable_device = rcar_gen4_pcie_enable_device;
 
-	rcar_gen4_pcie_host_perst_assert(pp, true);
+	reset_control_assert(rcar->perst);
 
 	ret = rcar->drvdata->init(rcar);
 	if (ret)
@@ -698,7 +687,7 @@ static int rcar_gen4_pcie_host_init(struct dw_pcie_rp *pp)
 
 	msleep(PCIE_T_PVPERL_MS);	/* pe_rst requires 100msec delay */
 
-	rcar_gen4_pcie_host_perst_assert(pp, false);
+	reset_control_deassert(rcar->perst);
 
 	return 0;
 
@@ -714,7 +703,7 @@ static void rcar_gen4_pcie_host_deinit(struct dw_pcie_rp *pp)
 	struct dw_pcie *dw = to_dw_pcie_from_pp(pp);
 	struct rcar_gen4_pcie *rcar = to_rcar_gen4_pcie(dw);
 
-	rcar_gen4_pcie_host_perst_assert(pp, true);
+	reset_control_assert(rcar->perst);
 	rcar->drvdata->deinit(rcar);
 	reset_control_put(rcar->perst);
 }
-- 
2.53.0