projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
005e35f
)
net: systemport: Use devm_ioremap_resource()
author
Jingoo Han
<
[email protected]
>
Wed, 14 May 2014 03:15:42 +0000
(12:15 +0900)
committer
David S. Miller
<
[email protected]
>
Wed, 14 May 2014 19:42:07 +0000
(15:42 -0400)
Use devm_ioremap_resource() because devm_request_and_ioremap() is
obsoleted by devm_ioremap_resource().
Signed-off-by: Jingoo Han <
[email protected]
>
Acked-by: Florian Fainelli <
[email protected]
>
Signed-off-by: David S. Miller <
[email protected]
>
drivers/net/ethernet/broadcom/bcmsysport.c
patch
|
blob
|
history
diff --git
a/drivers/net/ethernet/broadcom/bcmsysport.c
b/drivers/net/ethernet/broadcom/bcmsysport.c
index 56b74a495181eef7903e7a76c6868d584a9e25d6..f66de1344b6eb4c47923fc5ed8612756006a91f6 100644
(file)
--- a/
drivers/net/ethernet/broadcom/bcmsysport.c
+++ b/
drivers/net/ethernet/broadcom/bcmsysport.c
@@
-1514,10
+1514,9
@@
static int bcm_sysport_probe(struct platform_device *pdev)
goto err;
}
- priv->base = devm_request_and_ioremap(&pdev->dev, r);
- if (!priv->base) {
- dev_err(&pdev->dev, "register remap failed\n");
- ret = -ENOMEM;
+ priv->base = devm_ioremap_resource(&pdev->dev, r);
+ if (IS_ERR(priv->base)) {
+ ret = PTR_ERR(priv->base);
goto err;
}