diff options
| author |   David S. Miller <davem@davemloft.net> | 2017-02-16 19:34:01 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-02-16 19:34:01 -0500 |
| commit | 3f64116a838e6c3468f9d5eed7f1f87cf3a2c3eb (patch) | |
| tree | 388024d2ddbdcb9991ef4b472dfac31e425b807e /drivers/net/ethernet/ti | |
| parent | cxgb4: Remove redundant code in t4_uld_clean_up() (diff) | |
| parent | Merge tag 'media/v4.10-5' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media (diff) | |
| download | linux-dev-3f64116a838e6c3468f9d5eed7f1f87cf3a2c3eb.tar.xz linux-dev-3f64116a838e6c3468f9d5eed7f1f87cf3a2c3eb.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'drivers/net/ethernet/ti')
| -rw-r--r-- | drivers/net/ethernet/ti/cpsw.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c index e86f226b258e..10f6f7496f50 100644 --- a/drivers/net/ethernet/ti/cpsw.c +++ b/drivers/net/ethernet/ti/cpsw.c @@ -3207,7 +3207,7 @@ static int cpsw_resume(struct device *dev) { struct platform_device *pdev = to_platform_device(dev); struct net_device *ndev = platform_get_drvdata(pdev); - struct cpsw_common *cpsw = netdev_priv(ndev); + struct cpsw_common *cpsw = ndev_to_cpsw(ndev); /* Select default pin state */ pinctrl_pm_select_default_state(dev); |