iwl3945 & iwl4965: keep headers separate
PATCH 2/3 iwl3945 & iwl4965: keep headers separate
The iwl3945 and iwl4965 devices share some common structure, but with a lot of difference split all over. Currently the two drivers share a lot of headers and use ugly preprocessor magic to manage the difference.
This patch keeps two entirely separate copies of the headers to get rid of these hacks an ease future development.
drivers/net/wireless/iwlwifi/iwl-3945-rs.c +1 -4
@@ -39,12 +39,9 @@#include <net/mac80211.h> #include <linux/wireless.h> - -#define IWL 3945 -#include "../net/mac80211/ieee80211_rate.h" -#include "iwlwifi.h" +#include "iwl-3945.h" #define RS_NAME "iwl-3945-rs"
drivers/net/wireless/iwlwifi/iwl-3945.c +1 -4
@@ -40,11 +40,8 @@#include <linux/etherdevice.h> #include <linux/delay.h> -#define IWL 3945 - -#include "iwlwifi.h" -#include "iwl-helpers.h" #include "iwl-3945.h" +#include "iwl-helpers.h" #include "iwl-3945-rs.h" #define IWL_DECLARE_RATE_INFO (r, ip, in, rp, rn, pp, np) \
drivers/net/wireless/iwlwifi/iwl-3945.h +950 -0
960 lines not on this page · raw message
drivers/net/wireless/iwlwifi/iwl-4965-rs.c +1 -4
@@ -38,12 +38,9 @@#include <net/mac80211.h> #include <linux/wireless.h> - -#define IWL 4965 -#include "../net/mac80211/ieee80211_rate.h" -#include "iwlwifi.h" +#include "iwl-4965.h" #include "iwl-helpers.h" #define RS_NAME "iwl-4965-rs"
drivers/net/wireless/iwlwifi/iwl-4965.c +0 -3
@@ -39,9 +39,6 @@#include <linux/etherdevice.h> #include <linux/delay.h> -#define IWL 4965 - -#include "iwlwifi.h" #include "iwl-4965.h" #include "iwl-helpers.h"
drivers/net/wireless/iwlwifi/iwl-4965.h +1034 -1
1,051 lines not on this page · raw message
drivers/net/wireless/iwlwifi/iwl3945-base.c +1 -4
@@ -58,9 +58,6 @@#include <asm/div64.h> -#define IWL 3945 - -#include "iwlwifi.h" #include "iwl-3945.h" #include "iwl-helpers.h"
@@ -88,7 +85,7 @@ int iwl_param_queues_num = IWL_MAX_NUM_Q/* * module name, copyright, version, etc. -* NOTE: DRV_NAME is defined in iwlwifi.h for use by iwl-debug.h and printk +* NOTE: DRV_NAME is defined in iw-3945.h for use by iwl-debug.h and printk */ #define DRV_DESCRIPTION \
drivers/net/wireless/iwlwifi/iwl4965-base.c +1 -4
@@ -58,9 +58,6 @@#include <asm/div64.h> -#define IWL 4965 - -#include "iwlwifi.h" #include "iwl-4965.h" #include "iwl-helpers.h"
@@ -88,7 +85,7 @@ int iwl_param_queues_num = IWL_MAX_NUM_Q/* * module name, copyright, version, etc. -* NOTE: DRV_NAME is defined in iwlwifi.h for use by iwl-debug.h and printk +* NOTE: DRV_NAME is defined in iwl-4965.h for use by iwl-debug.h and printk */ #define DRV_DESCRIPTION "Intel(R) Wireless WiFi Link 4965AGN driver for Linux"
drivers/net/wireless/iwlwifi/iwlwifi.h deleted +0 -706
706 lines not on this page · raw message
drivers/net/wireless/iwlwifi/iwl-3945-debug.h new file +152 -0
152 lines not on this page · raw message
drivers/net/wireless/iwlwifi/iwl-3945-hw.h +2015 -0
50 lines not on this page · raw message
drivers/net/wireless/iwlwifi/iwl-3945-io.h new file +470 -0
470 lines not on this page · raw message
drivers/net/wireless/iwlwifi/iwl-4965-debug.h new file +152 -0
152 lines not on this page · raw message
drivers/net/wireless/iwlwifi/iwl-4965-hw.h +2180 -0
2,180 lines not on this page · raw message
drivers/net/wireless/iwlwifi/iwl-4965-io.h new file +471 -0
471 lines not on this page · raw message
drivers/net/wireless/iwlwifi/iwl-channel.h deleted +0 -161
161 lines not on this page · raw message
drivers/net/wireless/iwlwifi/iwl-commands.h deleted +0 -1734
1,734 lines not on this page · raw message
drivers/net/wireless/iwlwifi/iwl-debug.h deleted +0 -152
152 lines not on this page · raw message
drivers/net/wireless/iwlwifi/iwl-eeprom.h deleted +0 -336
336 lines not on this page · raw message
drivers/net/wireless/iwlwifi/iwl-hw.h deleted +0 -537
537 lines not on this page · raw message
drivers/net/wireless/iwlwifi/iwl-io.h deleted +0 -470
470 lines not on this page · raw message
drivers/net/wireless/iwlwifi/iwl-priv.h deleted +0 -308
308 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Part of the diff is not shown here. View the raw message.