| Message ID | 20220926113143.40768-3-bryan.odonoghue@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Fix pm8941-misc extcon interrupt dependency assumptions | expand |
On 28/09/2022 09:54, Marijn Suijten wrote: > On 2022-09-26 12:31:43, Bryan O'Donoghue wrote: >> Valid configurations for the extcon interrupt declarations are >> >> - usb_id >> - usb_vbus >> - (usb_id | usb_vbus) >> >> In the case of a standalone usb_id or usb_vbus failure to find one of the >> interrupts shouldn't generate a warning message. A warning is already in >> place if both IRQs are missing. >> >> Switch to using platform_get_irq_byname_optional() in order to facilitate >> this behaviour. >> >> Suggested-by: Marijn Suijten <marijn.suijten@somainline.org> >> Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> > > Feel free to carry my review from [1] even after addressing the > commit-message nit - thanks for doing so by the way! > > Reviewed-by: Marijn Suijten <marijn.suijten@somainline.org> > > [1]: https://lore.kernel.org/linux-arm-msm/20220704214444.p5oqik2cqo6h7723@SoMainline.org/ > > - Marijn Cool, thanks.
diff --git a/drivers/extcon/extcon-qcom-spmi-misc.c b/drivers/extcon/extcon-qcom-spmi-misc.c index eb02cb962b5e1..f72e90ceca53d 100644 --- a/drivers/extcon/extcon-qcom-spmi-misc.c +++ b/drivers/extcon/extcon-qcom-spmi-misc.c @@ -123,7 +123,7 @@ static int qcom_usb_extcon_probe(struct platform_device *pdev) if (ret) return ret; - info->id_irq = platform_get_irq_byname(pdev, "usb_id"); + info->id_irq = platform_get_irq_byname_optional(pdev, "usb_id"); if (info->id_irq > 0) { ret = devm_request_threaded_irq(dev, info->id_irq, NULL, qcom_usb_irq_handler, @@ -136,7 +136,7 @@ static int qcom_usb_extcon_probe(struct platform_device *pdev) } } - info->vbus_irq = platform_get_irq_byname(pdev, "usb_vbus"); + info->vbus_irq = platform_get_irq_byname_optional(pdev, "usb_vbus"); if (info->vbus_irq > 0) { ret = devm_request_threaded_irq(dev, info->vbus_irq, NULL, qcom_usb_irq_handler,
Valid configurations for the extcon interrupt declarations are - usb_id - usb_vbus - (usb_id | usb_vbus) In the case of a standalone usb_id or usb_vbus failure to find one of the interrupts shouldn't generate a warning message. A warning is already in place if both IRQs are missing. Switch to using platform_get_irq_byname_optional() in order to facilitate this behaviour. Suggested-by: Marijn Suijten <marijn.suijten@somainline.org> Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> --- drivers/extcon/extcon-qcom-spmi-misc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)