| Message ID | 20230201084131.v2.2.Ic4f8542b0588d7eb4bc6e322d4af3d2064e84ff0@changeid (mailing list archive) |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [v2,1/2] wifi: ath11k: Use platform_get_irq() to get the interrupt | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Not a local patch |
Hi Douglas, Thank you for the patch. > Subject: [PATCH v2 2/2] wifi: ath5k: Use platform_get_irq() to get the interrupt > > As of commit a1a2b7125e10 ("of/platform: Drop static setup of IRQ resource from DT core"), we need to > use platform_get_irq() instead of > platform_get_resource() to get our IRQs because > platform_get_resource() simply won't get them anymore. > > This was already fixed in several other Atheros WiFi drivers, apparently in response to Zeal Robot > reports. An example of another fix is commit 9503a1fc123d ("ath9k: Use platform_get_irq() to get the > interrupt"). ath5k seems to have been missed in this effort, though. > > Fixes: a1a2b7125e10 ("of/platform: Drop static setup of IRQ resource from DT core") > Signed-off-by: Douglas Anderson <dianders@chromium.org> > --- > I'm not setup to actually test this, but I figured that I might as well go all the way and fix all the > instances of the same pattern that I found in the ath drivers since the old call was actually breaking > me in ath11k. I did at least confirm that the code compiles for me. > > If folks would rather not land an untested patch like this, though, feel free to drop this and just > land patch #1 as long as that one looks OK. > > Changes in v2: > - Update commit message and point to patch that broke us (Jonas) > > drivers/net/wireless/ath/ath5k/ahb.c | 10 ++++------ > 1 file changed, 4 insertions(+), 6 deletions(-) > Reviewed-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com> Cheers, Prabhakar > diff --git a/drivers/net/wireless/ath/ath5k/ahb.c b/drivers/net/wireless/ath/ath5k/ahb.c > index 2c9cec8b53d9..28a1e5eff204 100644 > --- a/drivers/net/wireless/ath/ath5k/ahb.c > +++ b/drivers/net/wireless/ath/ath5k/ahb.c > @@ -113,15 +113,13 @@ static int ath_ahb_probe(struct platform_device *pdev) > goto err_out; > } > > - res = platform_get_resource(pdev, IORESOURCE_IRQ, 0); > - if (res == NULL) { > - dev_err(&pdev->dev, "no IRQ resource found\n"); > - ret = -ENXIO; > + irq = platform_get_irq(pdev, 0); > + if (irq < 0) { > + dev_err(&pdev->dev, "no IRQ resource found: %d\n", irq); > + ret = irq; > goto err_iounmap; > } > > - irq = res->start; > - > hw = ieee80211_alloc_hw(sizeof(struct ath5k_hw), &ath5k_hw_ops); > if (hw == NULL) { > dev_err(&pdev->dev, "no memory for ieee80211_hw\n"); > -- > 2.39.1.456.gfc5497dd1b-goog
diff --git a/drivers/net/wireless/ath/ath5k/ahb.c b/drivers/net/wireless/ath/ath5k/ahb.c index 2c9cec8b53d9..28a1e5eff204 100644 --- a/drivers/net/wireless/ath/ath5k/ahb.c +++ b/drivers/net/wireless/ath/ath5k/ahb.c @@ -113,15 +113,13 @@ static int ath_ahb_probe(struct platform_device *pdev) goto err_out; } - res = platform_get_resource(pdev, IORESOURCE_IRQ, 0); - if (res == NULL) { - dev_err(&pdev->dev, "no IRQ resource found\n"); - ret = -ENXIO; + irq = platform_get_irq(pdev, 0); + if (irq < 0) { + dev_err(&pdev->dev, "no IRQ resource found: %d\n", irq); + ret = irq; goto err_iounmap; } - irq = res->start; - hw = ieee80211_alloc_hw(sizeof(struct ath5k_hw), &ath5k_hw_ops); if (hw == NULL) { dev_err(&pdev->dev, "no memory for ieee80211_hw\n");
As of commit a1a2b7125e10 ("of/platform: Drop static setup of IRQ resource from DT core"), we need to use platform_get_irq() instead of platform_get_resource() to get our IRQs because platform_get_resource() simply won't get them anymore. This was already fixed in several other Atheros WiFi drivers, apparently in response to Zeal Robot reports. An example of another fix is commit 9503a1fc123d ("ath9k: Use platform_get_irq() to get the interrupt"). ath5k seems to have been missed in this effort, though. Fixes: a1a2b7125e10 ("of/platform: Drop static setup of IRQ resource from DT core") Signed-off-by: Douglas Anderson <dianders@chromium.org> --- I'm not setup to actually test this, but I figured that I might as well go all the way and fix all the instances of the same pattern that I found in the ath drivers since the old call was actually breaking me in ath11k. I did at least confirm that the code compiles for me. If folks would rather not land an untested patch like this, though, feel free to drop this and just land patch #1 as long as that one looks OK. Changes in v2: - Update commit message and point to patch that broke us (Jonas) drivers/net/wireless/ath/ath5k/ahb.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)