diff options
| author | David S. Miller <davem@davemloft.net> | 2013-05-16 17:07:46 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-05-16 17:07:46 -0700 |
| commit | 345af953b9764a9c66d50a046581d0acb21126df (patch) | |
| tree | cd138cd2878b94c9ad5cf37999265ee16bef0e99 /drivers/net/can/c_can/c_can_platform.c | |
| parent | ed8a83a1f4655a31e0080a19f08d896bb29434a9 (diff) | |
| parent | 5727dc6bf5b70dd278e58e26137e2df729b9c107 (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/c_can/c_can_platform.c')
| -rw-r--r-- | drivers/net/can/c_can/c_can_platform.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/can/c_can/c_can_platform.c b/drivers/net/can/c_can/c_can_platform.c index d63b91904f82..6b6130b8bdc4 100644 --- a/drivers/net/can/c_can/c_can_platform.c +++ b/drivers/net/can/c_can/c_can_platform.c @@ -234,7 +234,6 @@ static int c_can_plat_probe(struct platform_device *pdev) return 0; exit_free_device: - platform_set_drvdata(pdev, NULL); free_c_can_dev(dev); exit_iounmap: iounmap(addr); @@ -255,7 +254,6 @@ static int c_can_plat_remove(struct platform_device *pdev) struct resource *mem; unregister_c_can_dev(dev); - platform_set_drvdata(pdev, NULL); free_c_can_dev(dev); iounmap(priv->base); |