* Re: [PATCH net-next v3] net: gemini: Use devm_platform_get_and_ioremap_resource()
2021-06-07 8:11 [PATCH net-next v3] net: gemini: Use devm_platform_get_and_ioremap_resource() Yang Yingliang
@ 2021-06-07 8:10 ` Linus Walleij
2021-06-07 20:30 ` patchwork-bot+netdevbpf
1 sibling, 0 replies; 3+ messages in thread
From: Linus Walleij @ 2021-06-07 8:10 UTC (permalink / raw)
To: Yang Yingliang
Cc: linux-kernel, netdev, Hans Ulli Kroll, David S. Miller, Jakub Kicinski
On Mon, Jun 7, 2021 at 10:08 AM Yang Yingliang <yangyingliang@huawei.com> wrote:
> Use devm_platform_get_and_ioremap_resource() to simplify
> code.
>
> Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
> ---
> v3:
> remove netdev_info(...) in gemini_ethernet_port_probe()
Nice!
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH net-next v3] net: gemini: Use devm_platform_get_and_ioremap_resource()
@ 2021-06-07 8:11 Yang Yingliang
2021-06-07 8:10 ` Linus Walleij
2021-06-07 20:30 ` patchwork-bot+netdevbpf
0 siblings, 2 replies; 3+ messages in thread
From: Yang Yingliang @ 2021-06-07 8:11 UTC (permalink / raw)
To: linux-kernel, netdev; +Cc: ulli.kroll, linus.walleij, davem, kuba
Use devm_platform_get_and_ioremap_resource() to simplify
code.
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
---
v3:
remove netdev_info(...) in gemini_ethernet_port_probe()
v2:
Also use devm_platform_get_and_ioremap_resource() in gemini_ethernet_probe().
Keep the error message to distinguish remap which address failed in
gemini_ethernet_port_probe().
---
drivers/net/ethernet/cortina/gemini.c | 34 +++++++--------------------
1 file changed, 9 insertions(+), 25 deletions(-)
diff --git a/drivers/net/ethernet/cortina/gemini.c b/drivers/net/ethernet/cortina/gemini.c
index 8df6f081f244..c2ebb3388789 100644
--- a/drivers/net/ethernet/cortina/gemini.c
+++ b/drivers/net/ethernet/cortina/gemini.c
@@ -2356,8 +2356,6 @@ static int gemini_ethernet_port_probe(struct platform_device *pdev)
struct device *dev = &pdev->dev;
struct gemini_ethernet *geth;
struct net_device *netdev;
- struct resource *gmacres;
- struct resource *dmares;
struct device *parent;
unsigned int id;
int irq;
@@ -2390,24 +2388,18 @@ static int gemini_ethernet_port_probe(struct platform_device *pdev)
port->msg_enable = netif_msg_init(debug, DEFAULT_MSG_ENABLE);
/* DMA memory */
- dmares = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- if (!dmares) {
- dev_err(dev, "no DMA resource\n");
- return -ENODEV;
- }
- port->dma_base = devm_ioremap_resource(dev, dmares);
- if (IS_ERR(port->dma_base))
+ port->dma_base = devm_platform_get_and_ioremap_resource(pdev, 0, NULL);
+ if (IS_ERR(port->dma_base)) {
+ dev_err(dev, "get DMA address failed\n");
return PTR_ERR(port->dma_base);
+ }
/* GMAC config memory */
- gmacres = platform_get_resource(pdev, IORESOURCE_MEM, 1);
- if (!gmacres) {
- dev_err(dev, "no GMAC resource\n");
- return -ENODEV;
- }
- port->gmac_base = devm_ioremap_resource(dev, gmacres);
- if (IS_ERR(port->gmac_base))
+ port->gmac_base = devm_platform_get_and_ioremap_resource(pdev, 1, NULL);
+ if (IS_ERR(port->gmac_base)) {
+ dev_err(dev, "get GMAC address failed\n");
return PTR_ERR(port->gmac_base);
+ }
/* Interrupt */
irq = platform_get_irq(pdev, 0);
@@ -2502,10 +2494,6 @@ static int gemini_ethernet_port_probe(struct platform_device *pdev)
if (ret)
goto unprepare;
- netdev_info(netdev,
- "irq %d, DMA @ 0x%pap, GMAC @ 0x%pap\n",
- port->irq, &dmares->start,
- &gmacres->start);
return 0;
unprepare:
@@ -2544,17 +2532,13 @@ static int gemini_ethernet_probe(struct platform_device *pdev)
struct device *dev = &pdev->dev;
struct gemini_ethernet *geth;
unsigned int retry = 5;
- struct resource *res;
u32 val;
/* Global registers */
geth = devm_kzalloc(dev, sizeof(*geth), GFP_KERNEL);
if (!geth)
return -ENOMEM;
- res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- if (!res)
- return -ENODEV;
- geth->base = devm_ioremap_resource(dev, res);
+ geth->base = devm_platform_get_and_ioremap_resource(pdev, 0, NULL);
if (IS_ERR(geth->base))
return PTR_ERR(geth->base);
geth->dev = dev;
--
2.25.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH net-next v3] net: gemini: Use devm_platform_get_and_ioremap_resource()
2021-06-07 8:11 [PATCH net-next v3] net: gemini: Use devm_platform_get_and_ioremap_resource() Yang Yingliang
2021-06-07 8:10 ` Linus Walleij
@ 2021-06-07 20:30 ` patchwork-bot+netdevbpf
1 sibling, 0 replies; 3+ messages in thread
From: patchwork-bot+netdevbpf @ 2021-06-07 20:30 UTC (permalink / raw)
To: Yang Yingliang
Cc: linux-kernel, netdev, ulli.kroll, linus.walleij, davem, kuba
Hello:
This patch was applied to netdev/net-next.git (refs/heads/master):
On Mon, 7 Jun 2021 16:11:45 +0800 you wrote:
> Use devm_platform_get_and_ioremap_resource() to simplify
> code.
>
> Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
> ---
> v3:
> remove netdev_info(...) in gemini_ethernet_port_probe()
> v2:
> Also use devm_platform_get_and_ioremap_resource() in gemini_ethernet_probe().
> Keep the error message to distinguish remap which address failed in
> gemini_ethernet_port_probe().
>
> [...]
Here is the summary with links:
- [net-next,v3] net: gemini: Use devm_platform_get_and_ioremap_resource()
https://git.kernel.org/netdev/net-next/c/ef91f7981036
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-06-07 20:30 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-07 8:11 [PATCH net-next v3] net: gemini: Use devm_platform_get_and_ioremap_resource() Yang Yingliang
2021-06-07 8:10 ` Linus Walleij
2021-06-07 20:30 ` patchwork-bot+netdevbpf
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).