ath9k: Remove a few unused macros and fix indentation

Signed-off-by: Sujith Manoharan <Sujith.Manoharan@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

drivers/net/wireless/ath9k/core.h

@@ -140,8 +140,7 @@ struct ath_config {
 	u16 txpowlimit;
 	u16 txpowlimit_override;
 	u8 cabqReadytime; /* Cabq Readytime % */
-	u8    swBeaconProcess; /* Process received beacons
-					in SW (vs HW) */
+	u8 swBeaconProcess; /* Process received beacons in SW (vs HW) */
 };
 
 /***********************/
@@ -166,7 +165,7 @@ struct ath_chainmask_sel {
 	int cur_rx_mask; 	/* user configured or 3x3 */
 	int tx_avgrssi;
 	u8 switch_allowed:1, 	/* timer will set this */
-			    cm_sel_enabled:1;
+	   cm_sel_enabled : 1;
 };
 
 int ath_chainmask_sel_logic(struct ath_softc *sc, struct ath_node *an);
@@ -351,17 +350,17 @@ struct ath_recv_status {
 };
 
 struct ath_rxbuf {
-	struct sk_buff         		*rx_wbuf; /* buffer */
+	struct sk_buff *rx_wbuf;
 	unsigned long rx_time;			/* system time when received */
 	struct ath_recv_status rx_status;	/* cached rx status */
 };
 
 /* Per-TID aggregate receiver state for a node */
 struct ath_arx_tid {
-	struct ath_node     *an;        /* parent ath node */
+	struct ath_node *an;
 	struct ath_rxbuf *rxbuf;	/* re-ordering buffer */
 	struct timer_list timer;
-	spinlock_t          tidlock;    /* lock to protect this TID structure */
+	spinlock_t tidlock;
 	int baw_head;			/* seq_next at head */
 	int baw_tail;			/* tail of block-ack window */
 	int seq_reset;			/* need to reset start sequence */
@@ -447,23 +446,25 @@ struct ath_txq {
 	u32 axq_qnum;			/* hardware q number */
 	u32 *axq_link;			/* link ptr in last TX desc */
 	struct list_head axq_q;		/* transmit queue */
-	spinlock_t		axq_lock;	/* lock on q and link */
+	spinlock_t axq_lock;
 	unsigned long axq_lockflags;	/* intr state when must cli */
 	u32 axq_depth;			/* queue depth */
 	u8 axq_aggr_depth;		/* aggregates queued */
-	u32		axq_totalqueued;/* total ever queued */
-	u32			axq_intrcnt;	/* count to determine
-						if descriptor should generate
-						int on this txq. */
-	bool			stopped;	/* Is mac80211 queue
-						stopped ? */
-	/* State for patching up CTS when bursting */
+	u32 axq_totalqueued;		/* total ever queued */
+
+	/* count to determine if descriptor should generate int on this txq. */
+	u32 axq_intrcnt;
+
+	bool stopped;			/* Is mac80211 queue stopped ? */
 	struct ath_buf *axq_linkbuf;	/* virtual addr of last buffer*/
-	struct	ath_desc	*axq_lastdsWithCTS;	/* first desc of the
-					last descriptor that contains CTS  */
-	struct	ath_desc	*axq_gatingds; /* final desc of the gating desc
-				* that determines whether lastdsWithCTS has
-				* been DMA'ed or not */
+
+	/* first desc of the last descriptor that contains CTS */
+	struct ath_desc *axq_lastdsWithCTS;
+
+	/* final desc of the gating desc that determines whether
+	   lastdsWithCTS has been DMA'ed or not */
+	struct ath_desc *axq_gatingds;
+
 	struct list_head axq_acq;
 };
 
@@ -471,20 +472,19 @@ struct ath_txq {
 struct ath_atx_tid {
 	struct list_head list;		/* round-robin tid entry */
 	struct list_head buf_q;		/* pending buffers */
-	struct ath_node         *an;        /* parent node structure */
-	struct ath_atx_ac       *ac;        /* parent access category */
-	struct ath_buf          *tx_buf[ATH_TID_MAX_BUFS];/* active tx frames */
-	u16               seq_start;  /* starting seq of BA window */
-	u16               seq_next;   /* next seq to be used */
-	u16               baw_size;   /* BA window size */
-	int                     tidno;      /* TID number */
+	struct ath_node *an;
+	struct ath_atx_ac *ac;
+	struct ath_buf *tx_buf[ATH_TID_MAX_BUFS]; /* active tx frames */
+	u16 seq_start;
+	u16 seq_next;
+	u16 baw_size;
+	int tidno;
 	int baw_head;			/* first un-acked tx buffer */
 	int baw_tail;			/* next unused tx buffer slot */
-	int                     sched;      /* TID is scheduled */
-	int                     paused;     /* TID is paused */
-	int                     cleanup_inprogress; /* aggr of this TID is
-						being teared down */
-	u32               addba_exchangecomplete:1; /* ADDBA state */
+	int sched;
+	int paused;
+	int cleanup_inprogress;
+	u32 addba_exchangecomplete:1;
 	int32_t addba_exchangeinprogress;
 	int addba_exchangeattempts;
 };
@@ -506,26 +506,24 @@ struct ath_atx {
 
 /* per-frame tx control block */
 struct ath_tx_control {
-	struct ath_node *an;	/* destination to sent to */
-	int if_id;		/* only valid for cab traffic */
-	int qnum;		/* h/w queue number */
-	u32 ht:1;             /* if it can be transmitted using HT */
-	u32 ps:1;             /* if one or more stations are in PS mode */
-	u32 use_minrate:1;	/* if this frame should transmitted using
-				minimum rate */
-	enum ath9k_pkt_type atype;	/* Atheros packet type */
-	enum ath9k_key_type keytype;	/* key type */
-	u32 flags;		/* HAL flags */
-	u16 seqno;	/* sequence number */
-	u16 tidno;	/* tid number */
-	u16 txpower;	/* transmit power */
-	u16 frmlen;       /* frame length */
-	u32 keyix;        /* key index */
-	int min_rate;		/* minimum rate */
-	int mcast_rate;		/* multicast rate */
-	u16 nextfraglen;	/* next fragment length */
-	/* below is set only by ath_dev */
-	struct ath_softc *dev;	/* device handle */
+	struct ath_node *an;
+	int if_id;
+	int qnum;
+	u32 ht:1;
+	u32 ps:1;
+	u32 use_minrate:1;
+	enum ath9k_pkt_type atype;
+	enum ath9k_key_type keytype;
+	u32 flags;
+	u16 seqno;
+	u16 tidno;
+	u16 txpower;
+	u16 frmlen;
+	u32 keyix;
+	int min_rate;
+	int mcast_rate;
+	u16 nextfraglen;
+	struct ath_softc *dev;
 	dma_addr_t dmacontext;
 };
 
@@ -654,10 +652,10 @@ struct ath_node_aggr {
 /* driver-specific node state */
 struct ath_node {
 	struct list_head list;
-	struct ath_softc    	*an_sc; 		/* back pointer */
+	struct ath_softc *an_sc;
 	atomic_t an_refcnt;
 	struct ath_chainmask_sel an_chainmask_sel;
-	struct ath_node_aggr 	an_aggr; /* A-MPDU aggregation state */
+	struct ath_node_aggr an_aggr;
 	u8 an_smmode; /* SM Power save mode */
 	u8 an_flags;
 	u8 an_addr[ETH_ALEN];
@@ -754,15 +752,6 @@ int ath_update_beacon(struct ath_softc *sc,
 /* VAPs */
 /********/
 
-#define ATH_IF_HW_OFF           0x0001	/* hardware state needs to turn off */
-#define ATH_IF_HW_ON            0x0002	/* hardware state needs to turn on */
-/* STA only: the associated AP is HT capable */
-#define ATH_IF_HT               0x0004
-/* AP/IBSS only: current BSS has privacy on */
-#define ATH_IF_PRIVACY          0x0008
-#define ATH_IF_BEACON_ENABLE    0x0010	/* AP/IBSS only: enable beacon */
-#define ATH_IF_BEACON_SYNC      0x0020	/* IBSS only: need to sync beacon */
-
 /*
  * Define the scheme that we select MAC address for multiple
  * BSS on the same radio. The very first VAP will just use the MAC
@@ -782,18 +771,14 @@ struct ath_vap_config {
 
 /* driver-specific vap state */
 struct ath_vap {
-	struct ieee80211_vif            *av_if_data; /* interface(vap)
-				instance from 802.11 protocal layer */
+	struct ieee80211_vif *av_if_data;
 	enum ath9k_opmode av_opmode;	/* VAP operational mode */
 	struct ath_buf *av_bcbuf;	/* beacon buffer */
 	struct ath_beacon_offset av_boff; /* dynamic update state */
-	struct ath_tx_control           av_btxctl;  /* tx control information
-							for beacon */
+	struct ath_tx_control av_btxctl;  /* txctl information for beacon */
 	int av_bslot;			/* beacon slot index */
-	struct ath_txq                  av_mcastq;  /* multicast
-						transmit queue */
-	struct ath_vap_config           av_config;  /* vap configuration
-					parameters from 802.11 protocol layer*/
+	struct ath_txq av_mcastq;	/* multicast transmit queue */
+	struct ath_vap_config av_config;/* vap configuration parameters*/
 	struct ath_rate_node *rc_node;
 };