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

Commit 1cf69cfb authored Oct 10, 2008 by Luis R. Rodriguez Committed by David S. Miller Oct 10, 2008

ath9k: remove nasty FAIL macro from ath9k_hw_reset()

This is fucking horribe crap code so nuke it. There I cursed too in a commit log.

Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 4d74f8ba

drivers/net/wireless/ath9k/hw.c

+21 −12

Original line number	Diff line number	Diff line
		@@ -5867,7 +5867,6 @@ bool ath9k_hw_reset(struct ath_hal *ah,
		bool bChannelChange,
		int *status)
		{
		#define FAIL(_code) do { ecode = _code; goto bad; } while (0)
		u32 saveLedState;
		struct ath_hal_5416 *ahp = AH5416(ah);
		struct ath9k_channel *curchan = ah->ah_curchan;
		@@ -5889,7 +5888,8 @@ bool ath9k_hw_reset(struct ath_hal *ah,
		DPRINTF(ah->ah_sc, ATH_DBG_CHANNEL,
		"%s: invalid channel %u/0x%x; no mapping\n",
		__func__, chan->channel, chan->channelFlags);
		FAIL(-EINVAL);
		ecode = -EINVAL;
		goto bad;
		}

		if (!ath9k_hw_setpower(ah, ATH9K_PM_AWAKE))
		@@ -5930,7 +5930,8 @@ bool ath9k_hw_reset(struct ath_hal *ah,
		if (!ath9k_hw_chip_reset(ah, chan)) {
		DPRINTF(ah->ah_sc, ATH_DBG_RESET, "%s: chip reset failed\n",
		__func__);
		FAIL(-EIO);
		ecode = -EINVAL;
		goto bad;
		}

		if (AR_SREV_9280(ah)) {
		@@ -5947,8 +5948,10 @@ bool ath9k_hw_reset(struct ath_hal *ah,
		}

		ecode = ath9k_hw_process_ini(ah, chan, macmode);
		if (ecode != 0)
		if (ecode != 0) {
		ecode = -EINVAL;
		goto bad;
		}

		if (IS_CHAN_OFDM(chan) \|\| IS_CHAN_HT(chan))
		ath9k_hw_set_delta_slope(ah, chan);
		@@ -5961,7 +5964,8 @@ bool ath9k_hw_reset(struct ath_hal *ah,
		if (!ath9k_hw_eeprom_set_board_values(ah, chan)) {
		DPRINTF(ah->ah_sc, ATH_DBG_EEPROM,
		"%s: error setting board options\n", __func__);
		FAIL(-EIO);
		ecode = -EIO;
		goto bad;
		}

		ath9k_hw_decrease_chain_power(ah, chan);
		@@ -5989,11 +5993,15 @@ bool ath9k_hw_reset(struct ath_hal *ah,
		REG_WRITE(ah, AR_RSSI_THR, INIT_RSSI_THR);

		if (AR_SREV_9280_10_OR_LATER(ah)) {
		if (!(ath9k_hw_ar9280_set_channel(ah, chan)))
		FAIL(-EIO);
		if (!(ath9k_hw_ar9280_set_channel(ah, chan))) {
		ecode = -EIO;
		goto bad;
		}
		} else {
		if (!(ath9k_hw_set_channel(ah, chan)))
		FAIL(-EIO);
		if (!(ath9k_hw_set_channel(ah, chan))) {
		ecode = -EIO;
		goto bad;
		}
		}

		for (i = 0; i < AR_NUM_DCU; i++)
		@@ -6027,8 +6035,10 @@ bool ath9k_hw_reset(struct ath_hal *ah,

		ath9k_hw_init_bb(ah, chan);

		if (!ath9k_hw_init_cal(ah, chan))
		FAIL(-ENODEV);
		if (!ath9k_hw_init_cal(ah, chan)){
		ecode = -EIO;;
		goto bad;
		}

		rx_chainmask = ahp->ah_rxchainmask;
		if ((rx_chainmask == 0x5) \|\| (rx_chainmask == 0x3)) {
		@@ -6064,7 +6074,6 @@ bool ath9k_hw_reset(struct ath_hal *ah,
		if (status)
		*status = ecode;
		return false;
		#undef FAIL
		}

		bool ath9k_hw_phy_disable(struct ath_hal *ah)