phy: qcom-qmp-combo: use bulk reset_control API

Switch qcom-qmp-combo driver to use reset_control_bulk_assert / _deassert
functions rather than hardcoding the loops in the driver itself.

Acked-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Tested-by: Bjorn Andersson <bjorn.andersson@linaro.org> # UFS, PCIe and USB on SC8180X
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Link: https://lore.kernel.org/r/20220607213203.2819885-28-dmitry.baryshkov@linaro.org
Signed-off-by: Vinod Koul <vkoul@kernel.org>

diff --git a/drivers/phy/qualcomm/phy-qcom-qmp-combo.c b/drivers/phy/qualcomm/phy-qcom-qmp-combo.c
index 86dc400..893b5a4 100644 (file)
--- a/drivers/phy/qualcomm/phy-qcom-qmp-combo.c
+++ b/drivers/phy/qualcomm/phy-qcom-qmp-combo.c
@@ -741,7 +741,7 @@ struct qcom_qmp {
        void __iomem *dp_com;
 
        struct clk_bulk_data *clks;
-       struct reset_control **resets;
+       struct reset_control_bulk_data *resets;
        struct regulator_bulk_data *vregs;
 
        struct qmp_phy **phys;
@@ -1586,7 +1586,7 @@ static int qcom_qmp_phy_combo_com_init(struct qmp_phy *qphy)
        const struct qmp_phy_cfg *cfg = qphy->cfg;
        void __iomem *pcs = qphy->pcs;
        void __iomem *dp_com = qmp->dp_com;
-       int ret, i;
+       int ret;
 
        mutex_lock(&qmp->phy_mutex);
        if (qmp->init_count++) {
@@ -1601,22 +1601,16 @@ static int qcom_qmp_phy_combo_com_init(struct qmp_phy *qphy)
                goto err_unlock;
        }
 
-       for (i = 0; i < cfg->num_resets; i++) {
-               ret = reset_control_assert(qmp->resets[i]);
-               if (ret) {
-                       dev_err(qmp->dev, "%s reset assert failed\n",
-                               cfg->reset_list[i]);
-                       goto err_disable_regulators;
-               }
+       ret = reset_control_bulk_assert(cfg->num_resets, qmp->resets);
+       if (ret) {
+               dev_err(qmp->dev, "reset assert failed\n");
+               goto err_disable_regulators;
        }
 
-       for (i = cfg->num_resets - 1; i >= 0; i--) {
-               ret = reset_control_deassert(qmp->resets[i]);
-               if (ret) {
-                       dev_err(qmp->dev, "%s reset deassert failed\n",
-                               qphy->cfg->reset_list[i]);
-                       goto err_assert_reset;
-               }
+       ret = reset_control_bulk_deassert(cfg->num_resets, qmp->resets);
+       if (ret) {
+               dev_err(qmp->dev, "reset deassert failed\n");
+               goto err_disable_regulators;
        }
 
        ret = clk_bulk_prepare_enable(cfg->num_clks, qmp->clks);
@@ -1659,8 +1653,7 @@ static int qcom_qmp_phy_combo_com_init(struct qmp_phy *qphy)
        return 0;
 
 err_assert_reset:
-       while (++i < cfg->num_resets)
-               reset_control_assert(qmp->resets[i]);
+       reset_control_bulk_assert(cfg->num_resets, qmp->resets);
 err_disable_regulators:
        regulator_bulk_disable(cfg->num_vregs, qmp->vregs);
 err_unlock:
@@ -1673,7 +1666,6 @@ static int qcom_qmp_phy_combo_com_exit(struct qmp_phy *qphy)
 {
        struct qcom_qmp *qmp = qphy->qmp;
        const struct qmp_phy_cfg *cfg = qphy->cfg;
-       int i = cfg->num_resets;
 
        mutex_lock(&qmp->phy_mutex);
        if (--qmp->init_count) {
@@ -1683,8 +1675,7 @@ static int qcom_qmp_phy_combo_com_exit(struct qmp_phy *qphy)
 
        reset_control_assert(qmp->ufs_reset);
 
-       while (--i >= 0)
-               reset_control_assert(qmp->resets[i]);
+       reset_control_bulk_assert(cfg->num_resets, qmp->resets);
 
        clk_bulk_disable_unprepare(cfg->num_clks, qmp->clks);
 
@@ -1994,23 +1985,19 @@ static int qcom_qmp_phy_combo_reset_init(struct device *dev, const struct qmp_ph
 {
        struct qcom_qmp *qmp = dev_get_drvdata(dev);
        int i;
+       int ret;
 
        qmp->resets = devm_kcalloc(dev, cfg->num_resets,
                                   sizeof(*qmp->resets), GFP_KERNEL);
        if (!qmp->resets)
                return -ENOMEM;
 
-       for (i = 0; i < cfg->num_resets; i++) {
-               struct reset_control *rst;
-               const char *name = cfg->reset_list[i];
+       for (i = 0; i < cfg->num_resets; i++)
+               qmp->resets[i].id = cfg->reset_list[i];
 
-               rst = devm_reset_control_get_exclusive(dev, name);
-               if (IS_ERR(rst)) {
-                       dev_err(dev, "failed to get %s reset\n", name);
-                       return PTR_ERR(rst);
-               }
-               qmp->resets[i] = rst;
-       }
+       ret = devm_reset_control_bulk_get_exclusive(dev, cfg->num_resets, qmp->resets);
+       if (ret)
+               return dev_err_probe(dev, ret, "failed to get resets\n");
 
        return 0;
 }