diff options
author | Jingoo Han <jg1.han@samsung.com> | 2013-05-23 06:47:58 -0400 |
---|---|---|
committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2013-06-03 07:13:49 -0400 |
commit | 00e4bbc8cd7efac66caa4ce6bcf5f02e944184f6 (patch) | |
tree | 57aac83b859b47d0bc4fb444b9b5a39800754b04 /drivers/net/can/cc770 | |
parent | 4c4726faed6cf0c7545ac6523de4cc66acd0a61d (diff) |
net: can: use platform_{get,set}_drvdata()
Use the wrapper functions for getting and setting the driver data using
platform_device instead of using dev_{get,set}_drvdata() with &pdev->dev,
so we can directly pass a struct platform_device.
Also, unnecessary dev_set_drvdata() is removed, because the driver core
clears the driver data to NULL after device_release or on probe failure.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'drivers/net/can/cc770')
-rw-r--r-- | drivers/net/can/cc770/cc770_isa.c | 5 | ||||
-rw-r--r-- | drivers/net/can/cc770/cc770_platform.c | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/drivers/net/can/cc770/cc770_isa.c b/drivers/net/can/cc770/cc770_isa.c index 8eaaac81f320..87a47c0cfd49 100644 --- a/drivers/net/can/cc770/cc770_isa.c +++ b/drivers/net/can/cc770/cc770_isa.c | |||
@@ -265,7 +265,7 @@ static int cc770_isa_probe(struct platform_device *pdev) | |||
265 | else | 265 | else |
266 | priv->clkout = COR_DEFAULT; | 266 | priv->clkout = COR_DEFAULT; |
267 | 267 | ||
268 | dev_set_drvdata(&pdev->dev, dev); | 268 | platform_set_drvdata(pdev, dev); |
269 | SET_NETDEV_DEV(dev, &pdev->dev); | 269 | SET_NETDEV_DEV(dev, &pdev->dev); |
270 | 270 | ||
271 | err = register_cc770dev(dev); | 271 | err = register_cc770dev(dev); |
@@ -293,12 +293,11 @@ static int cc770_isa_probe(struct platform_device *pdev) | |||
293 | 293 | ||
294 | static int cc770_isa_remove(struct platform_device *pdev) | 294 | static int cc770_isa_remove(struct platform_device *pdev) |
295 | { | 295 | { |
296 | struct net_device *dev = dev_get_drvdata(&pdev->dev); | 296 | struct net_device *dev = platform_get_drvdata(pdev); |
297 | struct cc770_priv *priv = netdev_priv(dev); | 297 | struct cc770_priv *priv = netdev_priv(dev); |
298 | int idx = pdev->id; | 298 | int idx = pdev->id; |
299 | 299 | ||
300 | unregister_cc770dev(dev); | 300 | unregister_cc770dev(dev); |
301 | dev_set_drvdata(&pdev->dev, NULL); | ||
302 | 301 | ||
303 | if (mem[idx]) { | 302 | if (mem[idx]) { |
304 | iounmap(priv->reg_base); | 303 | iounmap(priv->reg_base); |
diff --git a/drivers/net/can/cc770/cc770_platform.c b/drivers/net/can/cc770/cc770_platform.c index d0f6bfc45aea..034bdd816a60 100644 --- a/drivers/net/can/cc770/cc770_platform.c +++ b/drivers/net/can/cc770/cc770_platform.c | |||
@@ -216,7 +216,7 @@ static int cc770_platform_probe(struct platform_device *pdev) | |||
216 | priv->reg_base, dev->irq, priv->can.clock.freq, | 216 | priv->reg_base, dev->irq, priv->can.clock.freq, |
217 | priv->cpu_interface, priv->bus_config, priv->clkout); | 217 | priv->cpu_interface, priv->bus_config, priv->clkout); |
218 | 218 | ||
219 | dev_set_drvdata(&pdev->dev, dev); | 219 | platform_set_drvdata(pdev, dev); |
220 | SET_NETDEV_DEV(dev, &pdev->dev); | 220 | SET_NETDEV_DEV(dev, &pdev->dev); |
221 | 221 | ||
222 | err = register_cc770dev(dev); | 222 | err = register_cc770dev(dev); |
@@ -240,7 +240,7 @@ exit_release_mem: | |||
240 | 240 | ||
241 | static int cc770_platform_remove(struct platform_device *pdev) | 241 | static int cc770_platform_remove(struct platform_device *pdev) |
242 | { | 242 | { |
243 | struct net_device *dev = dev_get_drvdata(&pdev->dev); | 243 | struct net_device *dev = platform_get_drvdata(pdev); |
244 | struct cc770_priv *priv = netdev_priv(dev); | 244 | struct cc770_priv *priv = netdev_priv(dev); |
245 | struct resource *mem; | 245 | struct resource *mem; |
246 | 246 | ||