Skip to content

Commit

Permalink
iwl3945: Getting rid of iwl-3945-led.h
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Samuel Ortiz authored and John W. Linville committed Jan 29, 2009
1 parent d9829a6 commit b5b8323
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 16 deletions.
16 changes: 1 addition & 15 deletions drivers/net/wireless/iwlwifi/iwl-3945-led.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,22 +30,8 @@
struct iwl3945_priv;

#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)
#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>
#include "iwl-led.h"

struct iwl3945_led {
struct iwl3945_priv *priv;
Expand Down
4 changes: 3 additions & 1 deletion drivers/net/wireless/iwlwifi/iwl-led.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

struct iwl_priv;

#ifdef CONFIG_IWLWIFI_LEDS
#if defined(CONFIG_IWLWIFI_LEDS) || defined(CONFIG_IWL3945_LEDS)
#include <linux/leds.h>

#define IWL_LED_SOLID 11
Expand All @@ -47,7 +47,9 @@ enum led_type {
IWL_LED_TRG_RADIO,
IWL_LED_TRG_MAX,
};
#endif

#ifdef CONFIG_IWLWIFI_LEDS

struct iwl_led {
struct iwl_priv *priv;
Expand Down

0 comments on commit b5b8323

Please sign in to comment.