Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3177bf6f authored by Mugunthan V N's avatar Mugunthan V N Committed by David S. Miller
Browse files

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: default avatarMugunthan V N <mugunthanvnm@ti.com>
Acked-by: default avatarRichard Cochran <richardcochran@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 83a9d197

drivers/net/ethernet/ti/cpsw.c

+3 −4
Original line number Diff line number Diff line
@@ -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;

}