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

Commit e79b1ca7 authored by Wey-Yi Guy's avatar Wey-Yi Guy
Browse files

iwlagn: use direct call for led functions 



After driver split, no need to call led functions through callback

Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
parent 6fc3ba99

drivers/net/wireless/iwlwifi/Makefile

+1 −1
Original line number Diff line number Diff line 
# AGN

obj-$(CONFIG_IWLAGN)	+= iwlagn.o

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

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

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

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

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

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

+0 −2
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ 
#include "iwl-agn.h"

#include "iwl-helpers.h"

#include "iwl-agn-hw.h"

#include "iwl-agn-led.h"

#include "iwl-agn-debugfs.h"



/* Highest firmware API version supported */
@@ -226,7 +225,6 @@ static const struct iwl_ops iwl1000_ops = { 
	.lib = &iwl1000_lib,

	.hcmd = &iwlagn_hcmd,

	.utils = &iwlagn_hcmd_utils,

	.led = &iwlagn_led_ops,

	.ieee80211_ops = &iwlagn_hw_ops,

};

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

+0 −5
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ 
#include "iwl-helpers.h"

#include "iwl-agn-hw.h"

#include "iwl-6000-hw.h"

#include "iwl-agn-led.h"

#include "iwl-agn-debugfs.h"



/* Highest firmware API version supported */
@@ -310,7 +309,6 @@ static const struct iwl_ops iwl2000_ops = { 
	.lib = &iwl2000_lib,

	.hcmd = &iwlagn_hcmd,

	.utils = &iwlagn_hcmd_utils,

	.led = &iwlagn_led_ops,

	.ieee80211_ops = &iwlagn_hw_ops,

};
@@ -318,7 +316,6 @@ static const struct iwl_ops iwl2030_ops = { 
	.lib = &iwl2000_lib,

	.hcmd = &iwlagn_bt_hcmd,

	.utils = &iwlagn_hcmd_utils,

	.led = &iwlagn_led_ops,

	.ieee80211_ops = &iwlagn_hw_ops,

};
@@ -326,7 +323,6 @@ static const struct iwl_ops iwl200_ops = { 
	.lib = &iwl2000_lib,

	.hcmd = &iwlagn_hcmd,

	.utils = &iwlagn_hcmd_utils,

	.led = &iwlagn_led_ops,

	.ieee80211_ops = &iwlagn_hw_ops,

};
@@ -334,7 +330,6 @@ static const struct iwl_ops iwl230_ops = { 
	.lib = &iwl2000_lib,

	.hcmd = &iwlagn_bt_hcmd,

	.utils = &iwlagn_hcmd_utils,

	.led = &iwlagn_led_ops,

	.ieee80211_ops = &iwlagn_hw_ops,

};

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

+0 −3
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ 
#include "iwl-sta.h"

#include "iwl-helpers.h"

#include "iwl-agn.h"

#include "iwl-agn-led.h"

#include "iwl-agn-hw.h"

#include "iwl-5000-hw.h"

#include "iwl-agn-debugfs.h"
@@ -447,7 +446,6 @@ static const struct iwl_ops iwl5000_ops = { 
	.lib = &iwl5000_lib,

	.hcmd = &iwlagn_hcmd,

	.utils = &iwlagn_hcmd_utils,

	.led = &iwlagn_led_ops,

	.ieee80211_ops = &iwlagn_hw_ops,

};
@@ -455,7 +453,6 @@ static const struct iwl_ops iwl5150_ops = { 
	.lib = &iwl5150_lib,

	.hcmd = &iwlagn_hcmd,

	.utils = &iwlagn_hcmd_utils,

	.led = &iwlagn_led_ops,

	.ieee80211_ops = &iwlagn_hw_ops,

};

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

+0 −5
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ 
#include "iwl-helpers.h"

#include "iwl-agn-hw.h"

#include "iwl-6000-hw.h"

#include "iwl-agn-led.h"

#include "iwl-agn-debugfs.h"



/* Highest firmware API version supported */
@@ -397,7 +396,6 @@ static const struct iwl_ops iwl6000_ops = { 
	.lib = &iwl6000_lib,

	.hcmd = &iwlagn_hcmd,

	.utils = &iwlagn_hcmd_utils,

	.led = &iwlagn_led_ops,

	.ieee80211_ops = &iwlagn_hw_ops,

};
@@ -405,7 +403,6 @@ static const struct iwl_ops iwl6050_ops = { 
	.lib = &iwl6000_lib,

	.hcmd = &iwlagn_hcmd,

	.utils = &iwlagn_hcmd_utils,

	.led = &iwlagn_led_ops,

	.nic = &iwl6050_nic_ops,

	.ieee80211_ops = &iwlagn_hw_ops,

};
@@ -414,7 +411,6 @@ static const struct iwl_ops iwl6150_ops = { 
	.lib = &iwl6000_lib,

	.hcmd = &iwlagn_hcmd,

	.utils = &iwlagn_hcmd_utils,

	.led = &iwlagn_led_ops,

	.nic = &iwl6150_nic_ops,

	.ieee80211_ops = &iwlagn_hw_ops,

};
@@ -423,7 +419,6 @@ static const struct iwl_ops iwl6030_ops = { 
	.lib = &iwl6030_lib,

	.hcmd = &iwlagn_bt_hcmd,

	.utils = &iwlagn_hcmd_utils,

	.led = &iwlagn_led_ops,

	.ieee80211_ops = &iwlagn_hw_ops,

};