UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

iwl3945: Getting rid of iwl-3945-led.h 

The duplicated LED definitions prevent one from including iwl-dev.h from the
3945 specific C files.
Moreover, we are sharing many definitions between iwl-3945-led.h and
iwl-led.h, so let's just use the iwl one. Note that this file will get more
cleanups once we share a common iwl_priv structure.

Signed-off-by: Samuel Ortiz <samuel.ortiz@intel.com>
Acked-by: Abhijeet Kolekar <abhijeet.kolekar@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Samuel Ortiz 2008-12-19 10:37:13 +08:00 committed by John W. Linville
parent d9829a67f9
commit b5b83239e7
2 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/net/wireless/iwlwifi/iwl-3945-led.h
View File

@ -30,22 +30,8 @@
struct iwl3945_priv; struct iwl3945_priv;
#ifdef CONFIG_IWL3945_LEDS #ifdef CONFIG_IWL3945_LEDS
#define IWL_LED_SOLID 11
#define IWL_LED_NAME_LEN 31
#define IWL_DEF_LED_INTRVL __constant_cpu_to_le32(1000)
#define IWL_LED_ACTIVITY (0<<1) #include "iwl-led.h"
#define IWL_LED_LINK (1<<1)
enum led_type {
IWL_LED_TRG_TX,
IWL_LED_TRG_RX,
IWL_LED_TRG_ASSOC,
IWL_LED_TRG_RADIO,
IWL_LED_TRG_MAX,
};
#include <linux/leds.h>
struct iwl3945_led { struct iwl3945_led {
struct iwl3945_priv *priv; struct iwl3945_priv *priv;

4
drivers/net/wireless/iwlwifi/iwl-led.h
View File

@ -30,7 +30,7 @@
struct iwl_priv; struct iwl_priv;
#ifdef CONFIG_IWLWIFI_LEDS #if defined(CONFIG_IWLWIFI_LEDS) || defined(CONFIG_IWL3945_LEDS)
#include <linux/leds.h> #include <linux/leds.h>
#define IWL_LED_SOLID 11 #define IWL_LED_SOLID 11
@ -47,7 +47,9 @@ enum led_type {
IWL_LED_TRG_RADIO, IWL_LED_TRG_RADIO,
IWL_LED_TRG_MAX, IWL_LED_TRG_MAX,
}; };
#endif
#ifdef CONFIG_IWLWIFI_LEDS
struct iwl_led { struct iwl_led {
struct iwl_priv *priv; struct iwl_priv *priv;