projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec...
[cascardo/linux.git]
/
drivers
/
net
/
can
/
bfin_can.c
diff --git
a/drivers/net/can/bfin_can.c
b/drivers/net/can/bfin_can.c
index
d4a15e8
..
a2700d2
100644
(file)
--- a/
drivers/net/can/bfin_can.c
+++ b/
drivers/net/can/bfin_can.c
@@
-580,7
+580,7
@@
static int bfin_can_probe(struct platform_device *pdev)
priv->pin_list = pdata;
priv->can.clock.freq = get_sclk();
priv->pin_list = pdata;
priv->can.clock.freq = get_sclk();
-
dev_set_drvdata(&pdev->
dev, dev);
+
platform_set_drvdata(p
dev, dev);
SET_NETDEV_DEV(dev, &pdev->dev);
dev->flags |= IFF_ECHO; /* we support local echo */
SET_NETDEV_DEV(dev, &pdev->dev);
dev->flags |= IFF_ECHO; /* we support local echo */
@@
-613,7
+613,7
@@
exit:
static int bfin_can_remove(struct platform_device *pdev)
{
static int bfin_can_remove(struct platform_device *pdev)
{
- struct net_device *dev =
dev_get_drvdata(&pdev->
dev);
+ struct net_device *dev =
platform_get_drvdata(p
dev);
struct bfin_can_priv *priv = netdev_priv(dev);
struct resource *res;
struct bfin_can_priv *priv = netdev_priv(dev);
struct resource *res;
@@
-621,8
+621,6
@@
static int bfin_can_remove(struct platform_device *pdev)
unregister_candev(dev);
unregister_candev(dev);
- dev_set_drvdata(&pdev->dev, NULL);
-
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
release_mem_region(res->start, resource_size(res));
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
release_mem_region(res->start, resource_size(res));
@@
-635,7
+633,7
@@
static int bfin_can_remove(struct platform_device *pdev)
#ifdef CONFIG_PM
static int bfin_can_suspend(struct platform_device *pdev, pm_message_t mesg)
{
#ifdef CONFIG_PM
static int bfin_can_suspend(struct platform_device *pdev, pm_message_t mesg)
{
- struct net_device *dev =
dev_get_drvdata(&pdev->
dev);
+ struct net_device *dev =
platform_get_drvdata(p
dev);
struct bfin_can_priv *priv = netdev_priv(dev);
struct bfin_can_regs __iomem *reg = priv->membase;
int timeout = BFIN_CAN_TIMEOUT;
struct bfin_can_priv *priv = netdev_priv(dev);
struct bfin_can_regs __iomem *reg = priv->membase;
int timeout = BFIN_CAN_TIMEOUT;
@@
-658,7
+656,7
@@
static int bfin_can_suspend(struct platform_device *pdev, pm_message_t mesg)
static int bfin_can_resume(struct platform_device *pdev)
{
static int bfin_can_resume(struct platform_device *pdev)
{
- struct net_device *dev =
dev_get_drvdata(&pdev->
dev);
+ struct net_device *dev =
platform_get_drvdata(p
dev);
struct bfin_can_priv *priv = netdev_priv(dev);
struct bfin_can_regs __iomem *reg = priv->membase;
struct bfin_can_priv *priv = netdev_priv(dev);
struct bfin_can_regs __iomem *reg = priv->membase;