target/linux/kirkwood/patches-3.10/0019-net-mv643xx_eth-use-managed-devm_ioremap-for-port-re.patch

   1 From ba7ccfb6824e89ea6175abcf854e7808597a2c40 Mon Sep 17 00:00:00 2001
   2 From: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
   3 Date: Wed, 29 May 2013 21:32:44 +0200
   4 Subject: [PATCH 19/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 ---
  11  drivers/net/ethernet/marvell/mv643xx_eth.c | 3 +--
  12  1 file changed, 1 insertion(+), 2 deletions(-)
  13
  14 diff --git a/drivers/net/ethernet/marvell/mv643xx_eth.c b/drivers/net/ethernet/marvell/mv643xx_eth.c
  15 index 748dcd3..0a8c064 100644
  16 --- a/drivers/net/ethernet/marvell/mv643xx_eth.c
  17 +++ b/drivers/net/ethernet/marvell/mv643xx_eth.c
  18 @@ -2470,7 +2470,7 @@ static int mv643xx_eth_shared_probe(struct platform_device *pdev)
  19         if (msp == NULL)
  20                 return -ENOMEM;
  21
  22 -       msp->base = ioremap(res->start, resource_size(res));
  23 +       msp->base = devm_ioremap(&pdev->dev, res->start, resource_size(res));
  24         if (msp->base == NULL)
  25                 return -ENOMEM;
  26
  27 @@ -2498,7 +2498,6 @@ static int mv643xx_eth_shared_remove(struct platform_device *pdev)
  28  {
  29         struct mv643xx_eth_shared_private *msp = platform_get_drvdata(pdev);
  30
  31 -       iounmap(msp->base);
  32         if (!IS_ERR(msp->clk))
  33                 clk_disable_unprepare(msp->clk);
  34
  35 --
  36 1.8.4.rc1
  37