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

Commit d6509151 authored by Sujith's avatar Sujith Committed by John W. Linville
Browse files

ath9k: Change return type for set_board_values() 



We always return true, checking for 'false' return value
is bogus anyway, so fix this.

Signed-off-by: default avatarSujith <Sujith.Manoharan@atheros.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent a83615d7

drivers/net/wireless/ath9k/eeprom.c

+2 −6
Original line number Diff line number Diff line
@@ -1232,7 +1232,7 @@ static void ath9k_hw_4k_set_gain(struct ath_hw *ah, 
		REG_WRITE(ah, AR9285_AN_TOP4, (AR9285_AN_TOP4_DEFAULT | 0x14));

}



static bool ath9k_hw_4k_set_board_values(struct ath_hw *ah,

static void ath9k_hw_4k_set_board_values(struct ath_hw *ah,

					 struct ath9k_channel *chan)

{

	struct modal_eep_4k_header *pModal;
@@ -1378,8 +1378,6 @@ static bool ath9k_hw_4k_set_board_values(struct ath_hw *ah, 
				      AR_PHY_SETTLING_SWITCH,

				      pModal->swSettleHt40);

	}



	return true;

}



static u16 ath9k_hw_4k_get_eeprom_antenna_cfg(struct ath_hw *ah,
@@ -1718,7 +1716,7 @@ static void ath9k_hw_def_set_gain(struct ath_hw *ah, 
	}

}



static bool ath9k_hw_def_set_board_values(struct ath_hw *ah,

static void ath9k_hw_def_set_board_values(struct ath_hw *ah,

					  struct ath9k_channel *chan)

{

	struct modal_eep_header *pModal;
@@ -1884,8 +1882,6 @@ static bool ath9k_hw_def_set_board_values(struct ath_hw *ah, 
			      AR_PHY_TX_DESIRED_SCALE_CCK,

			      eep->baseEepHeader.desiredScaleCCK);

	}



	return true;

}



static void ath9k_hw_def_set_addac(struct ath_hw *ah,

drivers/net/wireless/ath9k/eeprom.h

+1 −1
Original line number Diff line number Diff line
@@ -490,7 +490,7 @@ struct eeprom_ops { 
	u8 (*get_num_ant_config)(struct ath_hw *hw, enum ieee80211_band band);

	u16 (*get_eeprom_antenna_cfg)(struct ath_hw *hw,

				      struct ath9k_channel *chan);

	bool (*set_board_values)(struct ath_hw *hw, struct ath9k_channel *chan);

	void (*set_board_values)(struct ath_hw *hw, struct ath9k_channel *chan);

	void (*set_addac)(struct ath_hw *hw, struct ath9k_channel *chan);

	int (*set_txpower)(struct ath_hw *hw, struct ath9k_channel *chan,

			   u16 cfgCtl, u8 twiceAntennaReduction,

drivers/net/wireless/ath9k/hw.c

+1 −5
Original line number Diff line number Diff line
@@ -2277,11 +2277,7 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan, 
	else

		ath9k_hw_spur_mitigate(ah, chan);



	if (!ah->eep_ops->set_board_values(ah, chan)) {

		DPRINTF(ah->ah_sc, ATH_DBG_EEPROM,

			"error setting board options\n");

		return -EIO;

	}

	ah->eep_ops->set_board_values(ah, chan);



	ath9k_hw_decrease_chain_power(ah, chan);