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

Commit 84915c64 authored by Claudiu Manoil's avatar Claudiu Manoil Committed by David S. Miller
Browse files

gianfar: Remove unused field grp_id from gfar_priv_grp 



grp->grp_id is obsolete. It has no use in the current driver.
Remove it from gfar_priv_grp and put the 'rstat' member
in its place, in the 2nd cache line, as rstat needs fast access.

Signed-off-by: default avatarClaudiu Manoil <claudiu.manoil@freescale.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 376c7311

drivers/net/ethernet/freescale/gianfar.c

+0 −1
Original line number Diff line number Diff line
@@ -593,7 +593,6 @@ static int gfar_parse_group(struct device_node *np, 
			return -EINVAL;

	}



	grp->grp_id = priv->num_grps;

	grp->priv = priv;

	spin_lock_init(&grp->grplock);

	if (priv->mode == MQ_MG_MODE) {

drivers/net/ethernet/freescale/gianfar.h

+1 −3
Original line number Diff line number Diff line
@@ -1009,7 +1009,6 @@ struct gfar_irqinfo { 
 *	@napi: the napi poll function

 *	@priv: back pointer to the priv structure

 *	@regs: the ioremapped register space for this group

 *	@grp_id: group id for this group

 *	@irqinfo: TX/RX/ER irq data for this group

 */
@@ -1018,11 +1017,10 @@ struct gfar_priv_grp { 
	struct	napi_struct napi;

	struct gfar_private *priv;

	struct gfar __iomem *regs;

	unsigned int grp_id;

	unsigned int rstat;

	unsigned long num_rx_queues;

	unsigned long rx_bit_map;

	/* cacheline 3 */

	unsigned int rstat;

	unsigned int tstat;

	unsigned long num_tx_queues;

	unsigned long tx_bit_map;