diff options
| author |   Mugunthan V N <mugunthanvnm@ti.com> | 2012-11-27 07:53:40 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2012-11-28 17:51:16 -0500 |
| commit | 3177bf6f922f62743133abbcbbbb5545f4133b2d (patch) | |
| tree | 4fd61e11cf9b4e2b600c21e94470e1bb36ac37a9 /drivers/net/ethernet/ti | |
| parent | Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next (diff) | |
| download | linux-dev-3177bf6f922f62743133abbcbbbb5545f4133b2d.tar.xz linux-dev-3177bf6f922f62743133abbcbbbb5545f4133b2d.zip | |
net: ethernet: cpsw: fix build warnings for CPSW when CPTS not selected
CC drivers/net/ethernet/ti/cpsw.o
drivers/net/ethernet/ti/cpsw.c: In function 'cpsw_ndo_ioctl':
drivers/net/ethernet/ti/cpsw.c:881:20: warning: unused variable 'priv'
The build warning is generated when CPTS is not selected in Kernel Build.
Fixing by passing the net_device pointer to cpts IOCTL instead of passing priv
Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com>
Acked-by: Richard Cochran <richardcochran@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/ti')
| -rw-r--r-- | drivers/net/ethernet/ti/cpsw.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c index 02c24777e23b..c9714e1c164a 100644 --- a/drivers/net/ethernet/ti/cpsw.c +++ b/drivers/net/ethernet/ti/cpsw.c @@ -812,8 +812,9 @@ static void cpsw_hwtstamp_v2(struct cpsw_priv *priv) __raw_writel(ETH_P_1588, &priv->regs->ts_ltype); } -static int cpsw_hwtstamp_ioctl(struct cpsw_priv *priv, struct ifreq *ifr) +static int cpsw_hwtstamp_ioctl(struct net_device *dev, struct ifreq *ifr) { + struct cpsw_priv *priv = netdev_priv(dev); struct cpts *cpts = &priv->cpts; struct hwtstamp_config cfg; @@ -878,14 +879,12 @@ static int cpsw_hwtstamp_ioctl(struct cpsw_priv *priv, struct ifreq *ifr) static int cpsw_ndo_ioctl(struct net_device *dev, struct ifreq *req, int cmd) { - struct cpsw_priv *priv = netdev_priv(dev); - if (!netif_running(dev)) return -EINVAL; #ifdef CONFIG_TI_CPTS if (cmd == SIOCSHWTSTAMP) - return cpsw_hwtstamp_ioctl(priv, req); + return cpsw_hwtstamp_ioctl(dev, req); #endif return -ENOTSUPP; } |