* [PATCH] i2c: brcmstb: Fix handling of optional interrupt
@ 2020-04-25 21:38 ` Stefan Wahren
0 siblings, 0 replies; 6+ messages in thread
From: Stefan Wahren @ 2020-04-25 21:38 UTC (permalink / raw)
To: Kamal Dasu, Florian Fainelli, Wolfram Sang
Cc: Nicolas Saenz Julienne, bcm-kernel-feedback-list, linux-i2c,
linux-arm-kernel, Dave Stevenson, Stefan Wahren
From: Dave Stevenson <dave.stevenson@raspberrypi.com>
If there is no interrupt defined then an error is logged due
to the use of platform_get_irq. The driver handles not having
the interrupt by falling back to polling, therefore make
the appropriate call when claiming it.
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
---
drivers/i2c/busses/i2c-brcmstb.c | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
diff --git a/drivers/i2c/busses/i2c-brcmstb.c b/drivers/i2c/busses/i2c-brcmstb.c
index 169a283..d4e0a0f 100644
--- a/drivers/i2c/busses/i2c-brcmstb.c
+++ b/drivers/i2c/busses/i2c-brcmstb.c
@@ -647,20 +647,22 @@ static int brcmstb_i2c_probe(struct platform_device *pdev)
int_name = NULL;
/* Get the interrupt number */
- dev->irq = platform_get_irq(pdev, 0);
+ dev->irq = platform_get_irq_optional(pdev, 0);
/* disable the bsc interrupt line */
brcmstb_i2c_enable_disable_irq(dev, INT_DISABLE);
/* register the ISR handler */
- rc = devm_request_irq(&pdev->dev, dev->irq, brcmstb_i2c_isr,
- IRQF_SHARED,
- int_name ? int_name : pdev->name,
- dev);
-
- if (rc) {
- dev_dbg(dev->device, "falling back to polling mode");
- dev->irq = -1;
+ if (dev->irq >= 0) {
+ rc = devm_request_irq(&pdev->dev, dev->irq, brcmstb_i2c_isr,
+ IRQF_SHARED,
+ int_name ? int_name : pdev->name,
+ dev);
+
+ if (rc) {
+ dev_dbg(dev->device, "falling back to polling mode");
+ dev->irq = -1;
+ }
}
if (of_property_read_u32(dev->device->of_node,
--
2.7.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH] i2c: brcmstb: Fix handling of optional interrupt
@ 2020-04-25 21:38 ` Stefan Wahren
0 siblings, 0 replies; 6+ messages in thread
From: Stefan Wahren @ 2020-04-25 21:38 UTC (permalink / raw)
To: Kamal Dasu, Florian Fainelli, Wolfram Sang
Cc: Stefan Wahren, Dave Stevenson, Nicolas Saenz Julienne,
bcm-kernel-feedback-list, linux-i2c, linux-arm-kernel
From: Dave Stevenson <dave.stevenson@raspberrypi.com>
If there is no interrupt defined then an error is logged due
to the use of platform_get_irq. The driver handles not having
the interrupt by falling back to polling, therefore make
the appropriate call when claiming it.
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
---
drivers/i2c/busses/i2c-brcmstb.c | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
diff --git a/drivers/i2c/busses/i2c-brcmstb.c b/drivers/i2c/busses/i2c-brcmstb.c
index 169a283..d4e0a0f 100644
--- a/drivers/i2c/busses/i2c-brcmstb.c
+++ b/drivers/i2c/busses/i2c-brcmstb.c
@@ -647,20 +647,22 @@ static int brcmstb_i2c_probe(struct platform_device *pdev)
int_name = NULL;
/* Get the interrupt number */
- dev->irq = platform_get_irq(pdev, 0);
+ dev->irq = platform_get_irq_optional(pdev, 0);
/* disable the bsc interrupt line */
brcmstb_i2c_enable_disable_irq(dev, INT_DISABLE);
/* register the ISR handler */
- rc = devm_request_irq(&pdev->dev, dev->irq, brcmstb_i2c_isr,
- IRQF_SHARED,
- int_name ? int_name : pdev->name,
- dev);
-
- if (rc) {
- dev_dbg(dev->device, "falling back to polling mode");
- dev->irq = -1;
+ if (dev->irq >= 0) {
+ rc = devm_request_irq(&pdev->dev, dev->irq, brcmstb_i2c_isr,
+ IRQF_SHARED,
+ int_name ? int_name : pdev->name,
+ dev);
+
+ if (rc) {
+ dev_dbg(dev->device, "falling back to polling mode");
+ dev->irq = -1;
+ }
}
if (of_property_read_u32(dev->device->of_node,
--
2.7.4
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] i2c: brcmstb: Fix handling of optional interrupt
2020-04-25 21:38 ` Stefan Wahren
@ 2020-04-25 21:51 ` Florian Fainelli
-1 siblings, 0 replies; 6+ messages in thread
From: Florian Fainelli @ 2020-04-25 21:51 UTC (permalink / raw)
To: Stefan Wahren, Kamal Dasu, Florian Fainelli, Wolfram Sang
Cc: Nicolas Saenz Julienne, bcm-kernel-feedback-list, linux-i2c,
linux-arm-kernel, Dave Stevenson
On 4/25/2020 2:38 PM, Stefan Wahren wrote:
> From: Dave Stevenson <dave.stevenson@raspberrypi.com>
>
> If there is no interrupt defined then an error is logged due
> to the use of platform_get_irq. The driver handles not having
> the interrupt by falling back to polling, therefore make
> the appropriate call when claiming it.
>
> Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
> Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
Acked-by: Florian Fainelli <f.fainelli@gmail.com>
--
Florian
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] i2c: brcmstb: Fix handling of optional interrupt
@ 2020-04-25 21:51 ` Florian Fainelli
0 siblings, 0 replies; 6+ messages in thread
From: Florian Fainelli @ 2020-04-25 21:51 UTC (permalink / raw)
To: Stefan Wahren, Kamal Dasu, Florian Fainelli, Wolfram Sang
Cc: linux-arm-kernel, bcm-kernel-feedback-list, linux-i2c,
Nicolas Saenz Julienne, Dave Stevenson
On 4/25/2020 2:38 PM, Stefan Wahren wrote:
> From: Dave Stevenson <dave.stevenson@raspberrypi.com>
>
> If there is no interrupt defined then an error is logged due
> to the use of platform_get_irq. The driver handles not having
> the interrupt by falling back to polling, therefore make
> the appropriate call when claiming it.
>
> Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
> Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
Acked-by: Florian Fainelli <f.fainelli@gmail.com>
--
Florian
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] i2c: brcmstb: Fix handling of optional interrupt
2020-04-25 21:38 ` Stefan Wahren
@ 2020-04-26 8:01 ` Wolfram Sang
-1 siblings, 0 replies; 6+ messages in thread
From: Wolfram Sang @ 2020-04-26 8:01 UTC (permalink / raw)
To: Stefan Wahren
Cc: Kamal Dasu, Florian Fainelli, Nicolas Saenz Julienne,
bcm-kernel-feedback-list, linux-i2c, linux-arm-kernel,
Dave Stevenson
[-- Attachment #1: Type: text/plain, Size: 517 bytes --]
On Sat, Apr 25, 2020 at 11:38:07PM +0200, Stefan Wahren wrote:
> From: Dave Stevenson <dave.stevenson@raspberrypi.com>
>
> If there is no interrupt defined then an error is logged due
> to the use of platform_get_irq. The driver handles not having
> the interrupt by falling back to polling, therefore make
> the appropriate call when claiming it.
>
> Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
> Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
Applied to for-next, thanks!
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] i2c: brcmstb: Fix handling of optional interrupt
@ 2020-04-26 8:01 ` Wolfram Sang
0 siblings, 0 replies; 6+ messages in thread
From: Wolfram Sang @ 2020-04-26 8:01 UTC (permalink / raw)
To: Stefan Wahren
Cc: Florian Fainelli, Kamal Dasu, Dave Stevenson,
Nicolas Saenz Julienne, bcm-kernel-feedback-list, linux-i2c,
linux-arm-kernel
[-- Attachment #1.1: Type: text/plain, Size: 517 bytes --]
On Sat, Apr 25, 2020 at 11:38:07PM +0200, Stefan Wahren wrote:
> From: Dave Stevenson <dave.stevenson@raspberrypi.com>
>
> If there is no interrupt defined then an error is logged due
> to the use of platform_get_irq. The driver handles not having
> the interrupt by falling back to polling, therefore make
> the appropriate call when claiming it.
>
> Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
> Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
Applied to for-next, thanks!
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
[-- Attachment #2: Type: text/plain, Size: 176 bytes --]
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-04-26 8:01 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-04-25 21:38 [PATCH] i2c: brcmstb: Fix handling of optional interrupt Stefan Wahren
2020-04-25 21:38 ` Stefan Wahren
2020-04-25 21:51 ` Florian Fainelli
2020-04-25 21:51 ` Florian Fainelli
2020-04-26 8:01 ` Wolfram Sang
2020-04-26 8:01 ` Wolfram Sang
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.