]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
net: ethernet: cpsw: fix build warnings for CPSW when CPTS not selected
authorMugunthan V N <mugunthanvnm@ti.com>
Tue, 27 Nov 2012 07:53:40 +0000 (07:53 +0000)
committerDavid S. Miller <davem@davemloft.net>
Wed, 28 Nov 2012 22:51:16 +0000 (17:51 -0500)
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>
drivers/net/ethernet/ti/cpsw.c

index 02c24777e23b71af0d8332f7dc88acf13ba6511c..c9714e1c164ad0f54b069f131c0831c3e99e5b6e 100644 (file)
@@ -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;
 }