@@ -294,7 +294,7 @@ struct qcom_pcie {
294294
295295#define to_qcom_pcie (x ) dev_get_drvdata((x)->dev)
296296
297- static void qcom_perst_assert (struct qcom_pcie * pcie , bool assert )
297+ static void __qcom_pcie_perst_assert (struct qcom_pcie * pcie , bool assert )
298298{
299299 struct qcom_pcie_perst * perst ;
300300 struct qcom_pcie_port * port ;
@@ -308,16 +308,16 @@ static void qcom_perst_assert(struct qcom_pcie *pcie, bool assert)
308308 usleep_range (PERST_DELAY_US , PERST_DELAY_US + 500 );
309309}
310310
311- static void qcom_ep_reset_assert (struct qcom_pcie * pcie )
311+ static void qcom_pcie_perst_assert (struct qcom_pcie * pcie )
312312{
313- qcom_perst_assert (pcie , true);
313+ __qcom_pcie_perst_assert (pcie , true);
314314}
315315
316- static void qcom_ep_reset_deassert (struct qcom_pcie * pcie )
316+ static void qcom_pcie_perst_deassert (struct qcom_pcie * pcie )
317317{
318- /* Ensure that PERST has been asserted for at least 100 ms */
318+ /* Ensure that PERST# has been asserted for at least 100 ms */
319319 msleep (PCIE_T_PVPERL_MS );
320- qcom_perst_assert (pcie , false);
320+ __qcom_pcie_perst_assert (pcie , false);
321321}
322322
323323static int qcom_pcie_start_link (struct dw_pcie * pci )
@@ -654,9 +654,9 @@ static int qcom_pcie_assert_perst(struct dw_pcie *pci, bool assert)
654654 struct qcom_pcie * pcie = to_qcom_pcie (pci );
655655
656656 if (assert )
657- qcom_ep_reset_assert (pcie );
657+ qcom_pcie_perst_assert (pcie );
658658 else
659- qcom_ep_reset_deassert (pcie );
659+ qcom_pcie_perst_deassert (pcie );
660660
661661 return 0 ;
662662}
@@ -1308,7 +1308,7 @@ static int qcom_pcie_host_init(struct dw_pcie_rp *pp)
13081308 struct qcom_pcie * pcie = to_qcom_pcie (pci );
13091309 int ret ;
13101310
1311- qcom_ep_reset_assert (pcie );
1311+ qcom_pcie_perst_assert (pcie );
13121312
13131313 ret = pcie -> cfg -> ops -> init (pcie );
13141314 if (ret )
@@ -1324,7 +1324,7 @@ static int qcom_pcie_host_init(struct dw_pcie_rp *pp)
13241324 goto err_disable_phy ;
13251325 }
13261326
1327- qcom_ep_reset_deassert (pcie );
1327+ qcom_pcie_perst_deassert (pcie );
13281328
13291329 if (pcie -> cfg -> ops -> config_sid ) {
13301330 ret = pcie -> cfg -> ops -> config_sid (pcie );
@@ -1335,7 +1335,7 @@ static int qcom_pcie_host_init(struct dw_pcie_rp *pp)
13351335 return 0 ;
13361336
13371337err_assert_reset :
1338- qcom_ep_reset_assert (pcie );
1338+ qcom_pcie_perst_assert (pcie );
13391339err_disable_phy :
13401340 qcom_pcie_phy_power_off (pcie );
13411341err_deinit :
@@ -1349,7 +1349,7 @@ static void qcom_pcie_host_deinit(struct dw_pcie_rp *pp)
13491349 struct dw_pcie * pci = to_dw_pcie_from_pp (pp );
13501350 struct qcom_pcie * pcie = to_qcom_pcie (pci );
13511351
1352- qcom_ep_reset_assert (pcie );
1352+ qcom_pcie_perst_assert (pcie );
13531353 qcom_pcie_phy_power_off (pcie );
13541354 pcie -> cfg -> ops -> deinit (pcie );
13551355}
0 commit comments