On Tue, Oct 05, 2010 at 12:03:42PM +0200, Felix Fietkau wrote: > Throughout the code, DISABLE_REGWRITE_BUFFER is always called right after > REGWRITE_BUFFER_FLUSH. Since that's unlikely to change any time soon, that > makes keeping those ops separate rather pointless, as it only increases > code size and line number counts. > > Signed-off-by: Felix Fietkau <nbd@xxxxxxxxxxx> > --- > drivers/net/wireless/ath/ath.h | 4 +--- > drivers/net/wireless/ath/ath9k/ani.c | 6 ------ > drivers/net/wireless/ath/ath9k/ar5008_phy.c | 9 ++------- > drivers/net/wireless/ath/ath9k/ar9002_calib.c | 1 - > drivers/net/wireless/ath/ath9k/ar9002_hw.c | 4 ---- > drivers/net/wireless/ath/ath9k/ar9002_phy.c | 1 - > drivers/net/wireless/ath/ath9k/calib.c | 1 - > drivers/net/wireless/ath/ath9k/eeprom_4k.c | 2 -- > drivers/net/wireless/ath/ath9k/htc_drv_init.c | 12 ++---------- > drivers/net/wireless/ath/ath9k/hw.c | 14 -------------- > drivers/net/wireless/ath/ath9k/hw.h | 10 ++-------- > drivers/net/wireless/ath/ath9k/mac.c | 4 ---- > 12 files changed, 7 insertions(+), 61 deletions(-) > > v2: removed mwrite_cnt test > v3: removed comment about it from description Several patch hunks are buggered...examples: > diff --git a/drivers/net/wireless/ath/ath9k/ani.c b/drivers/net/wireless/ath/ath9k/ani.c > index 9936297..61e7a48 100644 > --- a/drivers/net/wireless/ath/ath9k/ani.c > +++ b/drivers/net/wireless/ath/ath9k/ani.c > @@ -180,7 +180,6 @@ static void ath9k_ani_restart_old(struct ath_hw *ah) > REG_WRITE(ah, AR_PHY_ERR_MASK_2, AR_PHY_ERR_CCK_TIMING); > REGWRITE_BUFFER_FLUSH(ah); > - DISABLE_REGWRITE_BUFFER(ah); > ath9k_hw_update_mibstats(ah, &ah->ah_mibStats); > @@ -215,7 +214,6 @@ static void ath9k_ani_restart_new(struct ath_hw *ah) > REG_WRITE(ah, AR_PHY_ERR_MASK_2, AR_PHY_ERR_CCK_TIMING); > REGWRITE_BUFFER_FLUSH(ah); > - DISABLE_REGWRITE_BUFFER(ah); > ath9k_hw_update_mibstats(ah, &ah->ah_mibStats); > @@ -643,7 +641,6 @@ static void ath9k_ani_reset_old(struct ath_hw *ah, bool is_scanning) > REG_WRITE(ah, AR_PHY_ERR_MASK_2, AR_PHY_ERR_CCK_TIMING); > REGWRITE_BUFFER_FLUSH(ah); > - DISABLE_REGWRITE_BUFFER(ah); > } > /* I applied the v2 version, but w/ the modification to the commit log. John -- John W. Linville Someday the world will need a hero, and you linville@xxxxxxxxxxxxx might be all we have. Be ready. -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
