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

Commit 887b8194 authored by Arseny Solokha's avatar Arseny Solokha Committed by David S. Miller
Browse files

gianfar: cleanup gianfar.h 



Remove now unused macro and structure definitions from gianfar.h that have
accumulated there over time.

Signed-off-by: default avatarArseny Solokha <asolokha@kb.kras.ru>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7ad38784

drivers/net/ethernet/freescale/gianfar.h

+0 −38
Original line number Diff line number Diff line
@@ -67,8 +67,6 @@ struct ethtool_rx_list { 
/* Number of bytes to align the rx bufs to */

#define RXBUF_ALIGNMENT 64



#define PHY_INIT_TIMEOUT 100000



#define DRV_NAME "gfar-enet"

extern const char gfar_driver_version[];
@@ -88,10 +86,6 @@ extern const char gfar_driver_version[]; 
#define GFAR_RX_MAX_RING_SIZE   256

#define GFAR_TX_MAX_RING_SIZE   256



#define GFAR_MAX_FIFO_THRESHOLD 511

#define GFAR_MAX_FIFO_STARVE	511

#define GFAR_MAX_FIFO_STARVE_OFF 511



#define FBTHR_SHIFT        24

#define DEFAULT_RX_LFC_THR  16

#define DEFAULT_LFC_PTVVAL  4
@@ -109,9 +103,6 @@ extern const char gfar_driver_version[]; 
#define DEFAULT_FIFO_TX_THR 0x100

#define DEFAULT_FIFO_TX_STARVE 0x40

#define DEFAULT_FIFO_TX_STARVE_OFF 0x80

#define DEFAULT_BD_STASH 1

#define DEFAULT_STASH_LENGTH	96

#define DEFAULT_STASH_INDEX	0



/* The number of Exact Match registers */

#define GFAR_EM_NUM	15
@@ -139,15 +130,6 @@ extern const char gfar_driver_version[]; 
#define DEFAULT_RX_COALESCE 0

#define DEFAULT_RXCOUNT	0



#define GFAR_SUPPORTED (SUPPORTED_10baseT_Half \

		| SUPPORTED_10baseT_Full \

		| SUPPORTED_100baseT_Half \

		| SUPPORTED_100baseT_Full \

		| SUPPORTED_Autoneg \

		| SUPPORTED_MII)



#define GFAR_SUPPORTED_GBIT SUPPORTED_1000baseT_Full



/* TBI register addresses */

#define MII_TBICON		0x11
@@ -185,8 +167,6 @@ extern const char gfar_driver_version[]; 
#define ECNTRL_REDUCED_MII_MODE	0x00000004

#define ECNTRL_SGMII_MODE	0x00000002



#define MRBLR_INIT_SETTINGS	DEFAULT_RX_BUFFER_SIZE



#define MINFLR_INIT_SETTINGS	0x00000040



/* Tqueue control */
@@ -266,12 +246,6 @@ extern const char gfar_driver_version[]; 
#define DEFAULT_TXIC mk_ic_value(DEFAULT_TXCOUNT, DEFAULT_TXTIME)

#define DEFAULT_RXIC mk_ic_value(DEFAULT_RXCOUNT, DEFAULT_RXTIME)



#define skip_bd(bdp, stride, base, ring_size) ({ \

	typeof(bdp) new_bd = (bdp) + (stride); \

	(new_bd >= (base) + (ring_size)) ? (new_bd - (ring_size)) : new_bd; })



#define next_bd(bdp, base, ring_size) skip_bd(bdp, 1, base, ring_size)



#define RCTRL_TS_ENABLE 	0x01000000

#define RCTRL_PAL_MASK		0x001f0000

#define RCTRL_LFC		0x00004000
@@ -385,11 +359,6 @@ extern const char gfar_driver_version[]; 
#define IMASK_RX_DISABLED ((~(IMASK_RX_DEFAULT)) & IMASK_DEFAULT)

#define IMASK_TX_DISABLED ((~(IMASK_TX_DEFAULT)) & IMASK_DEFAULT)



/* Fifo management */

#define FIFO_TX_THR_MASK	0x01ff

#define FIFO_TX_STARVE_MASK	0x01ff

#define FIFO_TX_STARVE_OFF_MASK	0x01ff



/* Attribute fields */



/* This enables rx snooping for buffers and descriptors */
@@ -1341,13 +1310,6 @@ extern const struct ethtool_ops gfar_ethtool_ops; 
#define RQFCR_PID_PORT_MASK 0xFFFF0000

#define RQFCR_PID_MAC_MASK 0xFF000000



struct gfar_mask_entry {

	unsigned int mask; /* The mask value which is valid form start to end */

	unsigned int start;

	unsigned int end;

	unsigned int block; /* Same block values indicate depended entries */

};



/* Represents a receive filer table entry */

struct gfar_filer_entry {

	u32 ctrl;