iwlagn: merge duplicate code into single function (86cb3b4e) · Commits · 戴 / test

drivers/net/wireless/iwlwifi/iwl-2000.c

+1 −15

Original line number	Diff line number	Diff line
		@@ -74,21 +74,7 @@ static void iwl2000_set_ct_threshold(struct iwl_priv *priv)
		/* NIC configuration for 2000 series */
		static void iwl2000_nic_config(struct iwl_priv *priv)
		{
		u16 radio_cfg;

		radio_cfg = iwl_eeprom_query16(priv, EEPROM_RADIO_CONFIG);

		/* write radio config values to register */
		if (EEPROM_RF_CFG_TYPE_MSK(radio_cfg) <= EEPROM_RF_CONFIG_TYPE_MAX)
		iwl_set_bit(priv, CSR_HW_IF_CONFIG_REG,
		EEPROM_RF_CFG_TYPE_MSK(radio_cfg) \|
		EEPROM_RF_CFG_STEP_MSK(radio_cfg) \|
		EEPROM_RF_CFG_DASH_MSK(radio_cfg));

		/* set CSR_HW_CONFIG_REG for uCode use */
		iwl_set_bit(priv, CSR_HW_IF_CONFIG_REG,
		CSR_HW_IF_CONFIG_REG_BIT_RADIO_SI \|
		CSR_HW_IF_CONFIG_REG_BIT_MAC_SI);
		iwl_rf_config(priv);

		if (priv->cfg->iq_invert)
		iwl_set_bit(priv, CSR_GP_DRIVER_REG,

+2 −15

Original line number	Diff line number	Diff line
		@@ -64,23 +64,10 @@
		static void iwl5000_nic_config(struct iwl_priv *priv)
		{
		unsigned long flags;
		u16 radio_cfg;

		spin_lock_irqsave(&priv->lock, flags);

		radio_cfg = iwl_eeprom_query16(priv, EEPROM_RADIO_CONFIG);
		iwl_rf_config(priv);

		/* write radio config values to register */
		if (EEPROM_RF_CFG_TYPE_MSK(radio_cfg) < EEPROM_RF_CONFIG_TYPE_MAX)
		iwl_set_bit(priv, CSR_HW_IF_CONFIG_REG,
		EEPROM_RF_CFG_TYPE_MSK(radio_cfg) \|
		EEPROM_RF_CFG_STEP_MSK(radio_cfg) \|
		EEPROM_RF_CFG_DASH_MSK(radio_cfg));

		/* set CSR_HW_CONFIG_REG for uCode use */
		iwl_set_bit(priv, CSR_HW_IF_CONFIG_REG,
		CSR_HW_IF_CONFIG_REG_BIT_RADIO_SI \|
		CSR_HW_IF_CONFIG_REG_BIT_MAC_SI);
		spin_lock_irqsave(&priv->lock, flags);

		/* W/A : NIC is stuck in a reset state after Early PCIe power off
		* (PCIe power is lost before PERST# is asserted),

+1 −15

Original line number	Diff line number	Diff line
		@@ -95,21 +95,7 @@ static void iwl6150_additional_nic_config(struct iwl_priv *priv)
		/* NIC configuration for 6000 series */
		static void iwl6000_nic_config(struct iwl_priv *priv)
		{
		u16 radio_cfg;

		radio_cfg = iwl_eeprom_query16(priv, EEPROM_RADIO_CONFIG);

		/* write radio config values to register */
		if (EEPROM_RF_CFG_TYPE_MSK(radio_cfg) <= EEPROM_RF_CONFIG_TYPE_MAX)
		iwl_set_bit(priv, CSR_HW_IF_CONFIG_REG,
		EEPROM_RF_CFG_TYPE_MSK(radio_cfg) \|
		EEPROM_RF_CFG_STEP_MSK(radio_cfg) \|
		EEPROM_RF_CFG_DASH_MSK(radio_cfg));

		/* set CSR_HW_CONFIG_REG for uCode use */
		iwl_set_bit(priv, CSR_HW_IF_CONFIG_REG,
		CSR_HW_IF_CONFIG_REG_BIT_RADIO_SI \|
		CSR_HW_IF_CONFIG_REG_BIT_MAC_SI);
		iwl_rf_config(priv);

		/* no locking required for register write */
		if (priv->cfg->pa_type == IWL_PA_INTERNAL) {

+25 −0

Original line number	Diff line number	Diff line
		@@ -834,3 +834,28 @@ const struct iwl_channel_info iwl_get_channel_info(const struct iwl_priv priv,

		return NULL;
		}

		void iwl_rf_config(struct iwl_priv *priv)
		{
		u16 radio_cfg;

		radio_cfg = iwl_eeprom_query16(priv, EEPROM_RADIO_CONFIG);

		/* write radio config values to register */
		if (EEPROM_RF_CFG_TYPE_MSK(radio_cfg) <= EEPROM_RF_CONFIG_TYPE_MAX) {
		iwl_set_bit(priv, CSR_HW_IF_CONFIG_REG,
		EEPROM_RF_CFG_TYPE_MSK(radio_cfg) \|
		EEPROM_RF_CFG_STEP_MSK(radio_cfg) \|
		EEPROM_RF_CFG_DASH_MSK(radio_cfg));
		IWL_INFO(priv, "Radio type=0x%x-0x%x-0x%x\n",
		EEPROM_RF_CFG_TYPE_MSK(radio_cfg),
		EEPROM_RF_CFG_STEP_MSK(radio_cfg),
		EEPROM_RF_CFG_DASH_MSK(radio_cfg));
		} else
		WARN_ON(1);

		/* set CSR_HW_CONFIG_REG for uCode use */
		iwl_set_bit(priv, CSR_HW_IF_CONFIG_REG,
		CSR_HW_IF_CONFIG_REG_BIT_RADIO_SI \|
		CSR_HW_IF_CONFIG_REG_BIT_MAC_SI);
		}

+1 −0

Original line number	Diff line number	Diff line
		@@ -310,5 +310,6 @@ void iwl_free_channel_map(struct iwl_priv *priv);
		const struct iwl_channel_info *iwl_get_channel_info(
		const struct iwl_priv *priv,
		enum ieee80211_band band, u16 channel);
		void iwl_rf_config(struct iwl_priv *priv);

		#endif /* __iwl_eeprom_h__ */