[PATCH 2/3] pinctrl: qcom: Use platform_irq_count() instead of of_irq_count()
Bjorn Andersson
bjorn at kryo.se
Wed Jan 6 17:19:04 PST 2016
On Wed, Jan 6, 2016 at 5:12 PM, Stephen Boyd <sboyd at codeaurora.org> wrote:
> of_irq_count() is not an exported symbol (and it shouldn't be
> used by platform drivers anyway) so use platform_irq_count()
> instead. This allows us to make the qcom pinctrl drivers modular
> again.
>
[..]
> diff --git a/drivers/pinctrl/qcom/pinctrl-ssbi-mpp.c b/drivers/pinctrl/qcom/pinctrl-ssbi-mpp.c
> index 3ddb4cc38f1c..37ae6b72ea35 100644
> --- a/drivers/pinctrl/qcom/pinctrl-ssbi-mpp.c
> +++ b/drivers/pinctrl/qcom/pinctrl-ssbi-mpp.c
> @@ -758,16 +758,19 @@ static int pm8xxx_mpp_probe(struct platform_device *pdev)
> struct pinctrl_pin_desc *pins;
> struct pm8xxx_mpp *pctrl;
> int ret;
> - int i;
> + int i, npins;
>
> pctrl = devm_kzalloc(&pdev->dev, sizeof(*pctrl), GFP_KERNEL);
> if (!pctrl)
> return -ENOMEM;
>
> pctrl->dev = &pdev->dev;
> - pctrl->npins = of_irq_count(pdev->dev.of_node);
> - if (!pctrl->npins)
> + npins = of_irq_count(pdev->dev.of_node);
platform_irq_count(pdev)
> + if (!npins)
> return -EINVAL;
> + if (npins < 0)
> + return npins;
> + pctrl->npins = npins;
>
> pctrl->regmap = dev_get_regmap(pdev->dev.parent, NULL);
> if (!pctrl->regmap) {
Regards,
Bjorn
More information about the linux-arm-kernel
mailing list