caf4d108505b02066bb03d8033b5e5808e80358f
[openwrt/svn-archive/archive.git] / target / linux / kirkwood / patches-3.10 / 0021-net-mv643xx_eth-use-managed-devm_ioremap-for-port-re.patch
1 From 002271ca6718b5dfb8082873fb0a60abc1d9e8d5 Mon Sep 17 00:00:00 2001
2 From: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
3 Date: Wed, 29 May 2013 09:32:44 +0000
4 Subject: [PATCH 21/29] net: mv643xx_eth: use managed devm_ioremap for port
5 registers
6
7 Make use of managed devm_ioremap and remove corresponding iounmap.
8
9 Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
10 Signed-off-by: David S. Miller <davem@davemloft.net>
11 ---
12 drivers/net/ethernet/marvell/mv643xx_eth.c | 3 +--
13 1 file changed, 1 insertion(+), 2 deletions(-)
14
15 --- a/drivers/net/ethernet/marvell/mv643xx_eth.c
16 +++ b/drivers/net/ethernet/marvell/mv643xx_eth.c
17 @@ -2470,7 +2470,7 @@ static int mv643xx_eth_shared_probe(stru
18 if (msp == NULL)
19 return -ENOMEM;
20
21 - msp->base = ioremap(res->start, resource_size(res));
22 + msp->base = devm_ioremap(&pdev->dev, res->start, resource_size(res));
23 if (msp->base == NULL)
24 return -ENOMEM;
25
26 @@ -2498,7 +2498,6 @@ static int mv643xx_eth_shared_remove(str
27 {
28 struct mv643xx_eth_shared_private *msp = platform_get_drvdata(pdev);
29
30 - iounmap(msp->base);
31 if (!IS_ERR(msp->clk))
32 clk_disable_unprepare(msp->clk);
33