diff options
author | Luka Perkov <luka@openwrt.org> | 2013-10-03 02:50:00 +0000 |
---|---|---|
committer | Luka Perkov <luka@openwrt.org> | 2013-10-03 02:50:00 +0000 |
commit | 38936426f7d4d569f918cb2ca646263b4c38e25b (patch) | |
tree | 66668ff6f447e0a95ee40e3cb8cbe3e211af3874 /target/linux/kirkwood/patches-3.10/0021-net-mv643xx_eth-use-managed-devm_ioremap-for-port-re.patch | |
parent | 97b15fc45be3d44b1d7700e92433703a139fb97c (diff) | |
download | upstream-38936426f7d4d569f918cb2ca646263b4c38e25b.tar.gz upstream-38936426f7d4d569f918cb2ca646263b4c38e25b.tar.bz2 upstream-38936426f7d4d569f918cb2ca646263b4c38e25b.zip |
kirkwood: update patches and configuration (3.10)
Signed-off-by: Luka Perkov <luka@openwrt.org>
SVN-Revision: 38295
Diffstat (limited to 'target/linux/kirkwood/patches-3.10/0021-net-mv643xx_eth-use-managed-devm_ioremap-for-port-re.patch')
-rw-r--r-- | target/linux/kirkwood/patches-3.10/0021-net-mv643xx_eth-use-managed-devm_ioremap-for-port-re.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/target/linux/kirkwood/patches-3.10/0021-net-mv643xx_eth-use-managed-devm_ioremap-for-port-re.patch b/target/linux/kirkwood/patches-3.10/0021-net-mv643xx_eth-use-managed-devm_ioremap-for-port-re.patch new file mode 100644 index 0000000000..caf4d10850 --- /dev/null +++ b/target/linux/kirkwood/patches-3.10/0021-net-mv643xx_eth-use-managed-devm_ioremap-for-port-re.patch @@ -0,0 +1,33 @@ +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 +@@ -2470,7 +2470,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; + +@@ -2498,7 +2498,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); + |