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

Commit e39fdee1 authored by Wey-Yi Guy's avatar Wey-Yi Guy Committed by John W. Linville
Browse files

iwlwifi: put all the isr related function under ops 



There were two type of isr supported by iwlwifi devices.
  legacy isr - only used by legacy devices (3945 & 4965)
  ict isr - used by all new generation of iwlwifi devices

Move all the isr related functions into ops, the ict type of isr
supports only needed for newer devices.

Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 81baf6ec

drivers/net/wireless/iwlwifi/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -11,14 +11,14 @@ CFLAGS_iwl-devtrace.o := -I$(src) 


# AGN

obj-$(CONFIG_IWLAGN)	+= iwlagn.o

iwlagn-objs		:= iwl-agn.o iwl-agn-rs.o iwl-agn-led.o iwl-agn-ict.o

iwlagn-objs		:= iwl-agn.o iwl-agn-rs.o iwl-agn-led.o

iwlagn-objs		+= iwl-agn-ucode.o iwl-agn-tx.o

iwlagn-objs		+= iwl-agn-lib.o iwl-agn-rx.o iwl-agn-calib.o

iwlagn-objs		+= iwl-agn-tt.o iwl-agn-sta.o iwl-agn-eeprom.o

iwlagn-$(CONFIG_IWLWIFI_DEBUGFS) += iwl-agn-debugfs.o



iwlagn-$(CONFIG_IWL4965) += iwl-4965.o

iwlagn-$(CONFIG_IWL5000) += iwl-agn-rxon.o iwl-agn-hcmd.o

iwlagn-$(CONFIG_IWL5000) += iwl-agn-rxon.o iwl-agn-hcmd.o iwl-agn-ict.o

iwlagn-$(CONFIG_IWL5000) += iwl-5000.o

iwlagn-$(CONFIG_IWL5000) += iwl-6000.o

iwlagn-$(CONFIG_IWL5000) += iwl-1000.o

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

+7 −1
Original line number Diff line number Diff line
@@ -211,7 +211,13 @@ static struct iwl_lib_ops iwl1000_lib = { 
		.calib_version	= iwlagn_eeprom_calib_version,

		.query_addr = iwlagn_eeprom_query_addr,

	},

	.isr_ops = {

		.isr = iwl_isr_ict,

		.free = iwl_free_isr_ict,

		.alloc = iwl_alloc_isr_ict,

		.reset = iwl_reset_ict,

		.disable = iwl_disable_ict,

	},

	.temp_ops = {

		.temperature = iwlagn_temperature,

	 },

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

+3 −1
Original line number Diff line number Diff line
@@ -2727,7 +2727,9 @@ static struct iwl_lib_ops iwl3945_lib = { 
	},

	.send_tx_power	= iwl3945_send_tx_power,

	.is_valid_rtc_data_addr = iwl3945_hw_valid_rtc_data_addr,

	.isr_ops = {

		.isr = iwl_isr_legacy,

	},

	.recover_from_tx_stall = iwl_bg_monitor_recover,

	.check_plcp_health = iwl3945_good_plcp_health,

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

+3 −1
Original line number Diff line number Diff line
@@ -2561,7 +2561,9 @@ static struct iwl_lib_ops iwl4965_lib = { 
	},

	.send_tx_power	= iwl4965_send_tx_power,

	.update_chain_flags = iwl_update_chain_flags,

	.isr_ops = {

		.isr = iwl_isr_legacy,

	},

	.temp_ops = {

		.temperature = iwl4965_temperature_calib,

	},

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

+14 −2
Original line number Diff line number Diff line
@@ -385,7 +385,13 @@ static struct iwl_lib_ops iwl5000_lib = { 
		.calib_version	= iwlagn_eeprom_calib_version,

		.query_addr = iwlagn_eeprom_query_addr,

	},

	.isr_ops = {

		.isr = iwl_isr_ict,

		.free = iwl_free_isr_ict,

		.alloc = iwl_alloc_isr_ict,

		.reset = iwl_reset_ict,

		.disable = iwl_disable_ict,

	},

	.temp_ops = {

		.temperature = iwlagn_temperature,

	 },
@@ -449,7 +455,13 @@ static struct iwl_lib_ops iwl5150_lib = { 
		.calib_version	= iwlagn_eeprom_calib_version,

		.query_addr = iwlagn_eeprom_query_addr,

	},

	.isr_ops = {

		.isr = iwl_isr_ict,

		.free = iwl_free_isr_ict,

		.alloc = iwl_alloc_isr_ict,

		.reset = iwl_reset_ict,

		.disable = iwl_disable_ict,

	},

	.temp_ops = {

		.temperature = iwl5150_temperature,

	 },