wifi: ath9k: ahb: do ioremap resource in one step
PATCH v2 1/1 wifi: ath9k: ahb: do ioremap resource in one step
Simplifies probe slightly and adds extra error codes.
Switching from devm_ioremap to the platform variant ends up calling devm_request_mem_region, which reserves the memory region for the various wmacs. Per board, there is only one wmac and after some fairly thorough analysis, there are no overlapping memory regions between wmacs and other devices on the ahb.
Tested on a TP-Link Archer C7v2.
---
v2: remove wrong devm irq conversion.
drivers/net/wireless/ath/ath9k/ahb.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-)
drivers/net/wireless/ath/ath9k/ahb.c +3 -10
@@ -74,7 +74,6 @@ static int ath_ahb_probe(struct platform_device *pdev)void __iomem *mem;struct ath_softc *sc;struct ieee80211_hw *hw; -struct resource *res;const struct platform_device_id *id =platform_get_device_id (pdev);int irq;int ret =0 ;
@@ -86,16 +85,10 @@ static int ath_ahb_probe(struct platform_device *pdev)return -EINVAL ; } - res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); -if (res ==NULL ) { -dev_err (&pdev->dev,"no memory resource found\n" ); -return -ENXIO ; - } - - mem =devm_ioremap (&pdev->dev, res->start,resource_size (res)); -if (mem ==NULL ) { + mem =devm_platform_ioremap_resource (pdev,0 ); +if (IS_ERR (mem)) {dev_err (&pdev->dev,"ioremap failed\n" ); -return -ENOMEM ; +return PTR_ERR (mem); } irq =platform_get_irq (pdev,0 );
Signature · 1 line
2.49.0
Toke Høiland-Jørgensen
maintainerQuoted 8 lines · Rosen Penev
Simplifies probe slightly and adds extra error codes.
Switching from
devm_ioremapto the platform variant ends up callingdevm_request_mem_region, which reserves the memory region for the various wmacs. Per board, there is only one wmac and after some fairly thorough analysis, there are no overlapping memory regions between wmacs and other devices on the ahb.
Quoted 7 lines
Tested on a TP-Link Archer C7v2.
Signed-off-by Rosen Penev <[email protected]>---
v2: remove wrong devm irq conversion.drivers/net/wireless/ath/ath9k/ahb.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-)
Is there any benefit from this other than code simplification? Because, TBH, I'm not sure saving 7 lines of code is worth the risk of changing something we know works already...
-Toke
Quoted 19 lines · Toke Høiland-Jørgensen
Quoted 8 lines · Rosen Penev
Simplifies probe slightly and adds extra error codes.
Switching from
devm_ioremapto the platform variant ends up callingdevm_request_mem_region, which reserves the memory region for the various wmacs. Per board, there is only one wmac and after some fairly thorough analysis, there are no overlapping memory regions between wmacs and other devices on the ahb.Quoted 7 lines
Tested on a TP-Link Archer C7v2.
Signed-off-by Rosen Penev <[email protected]>---
v2: remove wrong devm irq conversion.drivers/net/wireless/ath/ath9k/ahb.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-)
Quoted 3 lines
Is there any benefit from this other than code simplification? Because, TBH, I'm not sure saving 7 lines of code is worth the risk of changing something we know works already...
It's the same API calls fundamentally. This change has already been done treewide across various drivers.
Quoted 2 lines
-Toke
Toke Høiland-Jørgensen
maintainerQuoted 20 lines · Rosen Penev
Quoted 19 lines · Toke Høiland-Jørgensen
Quoted 15 lines · Rosen Penev
Simplifies probe slightly and adds extra error codes.
Switching from
devm_ioremapto the platform variant ends up callingdevm_request_mem_region, which reserves the memory region for the various wmacs. Per board, there is only one wmac and after some fairly thorough analysis, there are no overlapping memory regions between wmacs and other devices on the ahb.Tested on a TP-Link Archer C7v2.
Signed-off-by Rosen Penev <[email protected]>---
v2: remove wrong devm irq conversion.drivers/net/wireless/ath/ath9k/ahb.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-)
Quoted 5 lines
Quoted 3 lines
Is there any benefit from this other than code simplification? Because, TBH, I'm not sure saving 7 lines of code is worth the risk of changing something we know works already...
It's the same API calls fundamentally. This change has already been done treewide across various drivers.
Hmm, alright, let's give it a shot...
-Toke
Quoted 11 lines · Rosen Penev
Simplifies probe slightly and adds extra error codes.
Switching from
devm_ioremapto the platform variant ends up callingdevm_request_mem_region, which reserves the memory region for the various wmacs. Per board, there is only one wmac and after some fairly thorough analysis, there are no overlapping memory regions between wmacs and other devices on the ahb.Tested on a TP-Link Archer C7v2.
Signed-off-by Rosen Penev <[email protected]>
Jeff Johnson
AppliedQuoted 9 lines · Rosen Penev
Simplifies probe slightly and adds extra error codes.
Switching from
devm_ioremapto the platform variant ends up callingdevm_request_mem_region, which reserves the memory region for the various wmacs. Per board, there is only one wmac and after some fairly thorough analysis, there are no overlapping memory regions between wmacs and other devices on the ahb.[...]
Applied, thanks!
[1/1] wifi: ath9k: ahb: do ioremap resource in one step
commit: b4206774fe8231187e5863ff861160db77d4960b
Best regards,
Signature · 1 line
Jeff Johnson <[email protected]>