aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/can/flexcan.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2013-05-16 20:07:46 -0400
committerDavid S. Miller <davem@davemloft.net>2013-05-16 20:07:46 -0400
commit345af953b9764a9c66d50a046581d0acb21126df (patch)
treecd138cd2878b94c9ad5cf37999265ee16bef0e99 /drivers/net/can/flexcan.c
parented8a83a1f4655a31e0080a19f08d896bb29434a9 (diff)
parent5727dc6bf5b70dd278e58e26137e2df729b9c107 (diff)
Merge branch 'for-davem' of git://gitorious.org/linux-can/linux-can-next
Marc Kleine-Budde says: ==================== this is a pull-request for net-next/master. It consists of 4 patches by Jingoo Han, which remove the unnecessary platform_set_drvdata() and a patch by Laurent Navet converting the grcan driver to use devm_ioremap_resource(). ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/can/flexcan.c')
-rw-r--r--drivers/net/can/flexcan.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c
index 769d29ed106d..4a40a186c8c8 100644
--- a/drivers/net/can/flexcan.c
+++ b/drivers/net/can/flexcan.c
@@ -1127,7 +1127,6 @@ static int flexcan_remove(struct platform_device *pdev)
1127 struct resource *mem; 1127 struct resource *mem;
1128 1128
1129 unregister_flexcandev(dev); 1129 unregister_flexcandev(dev);
1130 platform_set_drvdata(pdev, NULL);
1131 iounmap(priv->base); 1130 iounmap(priv->base);
1132 1131
1133 mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); 1132 mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);