34 lines
1.1 KiB
Diff
34 lines
1.1 KiB
Diff
From 002271ca6718b5dfb8082873fb0a60abc1d9e8d5 Mon Sep 17 00:00:00 2001
|
|
From: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
|
|
Date: Wed, 29 May 2013 09:32:44 +0000
|
|
Subject: [PATCH 21/29] net: mv643xx_eth: use managed devm_ioremap for port
|
|
registers
|
|
|
|
Make use of managed devm_ioremap and remove corresponding iounmap.
|
|
|
|
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
---
|
|
drivers/net/ethernet/marvell/mv643xx_eth.c | 3 +--
|
|
1 file changed, 1 insertion(+), 2 deletions(-)
|
|
|
|
--- a/drivers/net/ethernet/marvell/mv643xx_eth.c
|
|
+++ b/drivers/net/ethernet/marvell/mv643xx_eth.c
|
|
@@ -2469,7 +2469,7 @@ static int mv643xx_eth_shared_probe(stru
|
|
if (msp == NULL)
|
|
return -ENOMEM;
|
|
|
|
- msp->base = ioremap(res->start, resource_size(res));
|
|
+ msp->base = devm_ioremap(&pdev->dev, res->start, resource_size(res));
|
|
if (msp->base == NULL)
|
|
return -ENOMEM;
|
|
|
|
@@ -2497,7 +2497,6 @@ static int mv643xx_eth_shared_remove(str
|
|
{
|
|
struct mv643xx_eth_shared_private *msp = platform_get_drvdata(pdev);
|
|
|
|
- iounmap(msp->base);
|
|
if (!IS_ERR(msp->clk))
|
|
clk_disable_unprepare(msp->clk);
|
|
|