[PATCH v5 14/17] pinctrl: qcom: Use qcom_scm_io_update_field()

[Mukesh Ojha]

Use qcom_scm_io_update_field() exported function in
pinctrl-msm driver.

Signed-off-by: Mukesh Ojha <quic_mo...@quicinc.com>
---
 drivers/pinctrl/qcom/pinctrl-msm.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/drivers/pinctrl/qcom/pinctrl-msm.c 
b/drivers/pinctrl/qcom/pinctrl-msm.c
index 115b83e2d8e6..2b9182375702 100644
--- a/drivers/pinctrl/qcom/pinctrl-msm.c
+++ b/drivers/pinctrl/qcom/pinctrl-msm.c
@@ -1078,22 +1078,20 @@ static int msm_gpio_irq_set_type(struct irq_data *d, 
unsigned int type)
        if (g->intr_target_width)
                intr_target_mask = GENMASK(g->intr_target_width - 1, 0);
 
+       intr_target_mask <<= g->intr_target_bit;
        if (pctrl->intr_target_use_scm) {
                u32 addr = pctrl->phys_base[0] + g->intr_target_reg;
                int ret;
 
-               qcom_scm_io_readl(addr, &val);
-               val &= ~(intr_target_mask << g->intr_target_bit);
-               val |= g->intr_target_kpss_val << g->intr_target_bit;
-
-               ret = qcom_scm_io_writel(addr, val);
+               val = g->intr_target_kpss_val << g->intr_target_bit;
+               ret = qcom_scm_io_update_field(addr, intr_target_mask, val);
                if (ret)
                        dev_err(pctrl->dev,
                                "Failed routing %lu interrupt to Apps proc",
                                d->hwirq);
        } else {
                val = msm_readl_intr_target(pctrl, g);
-               val &= ~(intr_target_mask << g->intr_target_bit);
+               val &= ~intr_target_mask;
                val |= g->intr_target_kpss_val << g->intr_target_bit;
                msm_writel_intr_target(val, pctrl, g);
        }
-- 
2.7.4