aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2013-03-17 14:33:13 +0000
committerFlorian Fainelli <florian@openwrt.org>2013-03-17 14:33:13 +0000
commit8ed2299646bec72d638e3e6dd11881216ebbbd3a (patch)
tree73ce366ef64fe6fbcb6405f2161ed379a1bef1f2
parent8bc84bac3137b4a3b35ad1db604f7259adf8b05e (diff)
downloadupstream-8ed2299646bec72d638e3e6dd11881216ebbbd3a.tar.gz
upstream-8ed2299646bec72d638e3e6dd11881216ebbbd3a.tar.bz2
upstream-8ed2299646bec72d638e3e6dd11881216ebbbd3a.zip
mcs814x: use devm_request_and_ioremap helper for nuport_mac driver
Signed-off-by: Florian Fainelli <florian@openwrt.org> SVN-Revision: 36062
-rw-r--r--target/linux/mcs814x/files-3.3/drivers/net/ethernet/mcs8140/nuport_mac.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/target/linux/mcs814x/files-3.3/drivers/net/ethernet/mcs8140/nuport_mac.c b/target/linux/mcs814x/files-3.3/drivers/net/ethernet/mcs8140/nuport_mac.c
index 511d261d0d..f11f425a00 100644
--- a/target/linux/mcs814x/files-3.3/drivers/net/ethernet/mcs8140/nuport_mac.c
+++ b/target/linux/mcs814x/files-3.3/drivers/net/ethernet/mcs8140/nuport_mac.c
@@ -1044,16 +1044,14 @@ static int __init nuport_mac_probe(struct platform_device *pdev)
else
priv->buffer_shifting_len = 2;
- priv->mac_base = devm_ioremap(&pdev->dev,
- regs->start, resource_size(regs));
+ priv->mac_base = devm_request_and_ioremap(&pdev->dev, regs);
if (!priv->mac_base) {
dev_err(&pdev->dev, "failed to remap regs\n");
ret = -ENOMEM;
goto out_platform;
}
- priv->dma_base = devm_ioremap(&pdev->dev,
- dma->start, resource_size(dma));
+ priv->dma_base = devm_request_and_ioremap(&pdev->dev, dma);
if (!priv->dma_base) {
dev_err(&pdev->dev, "failed to remap dma-regs\n");
ret = -ENOMEM;