aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2011-04-13 15:56:43 -0400
committerJohn W. Linville <linville@tuxdriver.com>2011-04-14 15:35:08 -0400
commit0cb9e06b6359bfa82f46c38a0b43e72d90b84081 (patch)
tree38a9c85bf15141681f7f3d3fd743464a88a96b7e
parent7f94f05b24b47f6b70f2322b26876d0636329dfe (diff)
ath: unshare struct ath_bus_ops between ath5k and ath9k
This struct is not used in any common code, and moving it out of the ath header makes it easier to add more driver specific ops. Signed-off-by: Felix Fietkau <nbd@openwrt.org> Tested-by: Sedat Dilek <sedat.dilek@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/ath/ath.h9
-rw-r--r--drivers/net/wireless/ath/ath5k/ath5k.h6
-rw-r--r--drivers/net/wireless/ath/ath9k/hw.h8
3 files changed, 15 insertions, 8 deletions
diff --git a/drivers/net/wireless/ath/ath.h b/drivers/net/wireless/ath/ath.h
index 6d7105b7e8f..7cf4317a2a8 100644
--- a/drivers/net/wireless/ath/ath.h
+++ b/drivers/net/wireless/ath/ath.h
@@ -123,14 +123,7 @@ struct ath_ops {
123}; 123};
124 124
125struct ath_common; 125struct ath_common;
126 126struct ath_bus_ops;
127struct ath_bus_ops {
128 enum ath_bus_type ath_bus_type;
129 void (*read_cachesize)(struct ath_common *common, int *csz);
130 bool (*eeprom_read)(struct ath_common *common, u32 off, u16 *data);
131 void (*bt_coex_prep)(struct ath_common *common);
132 void (*extn_synch_en)(struct ath_common *common);
133};
134 127
135struct ath_common { 128struct ath_common {
136 void *ah; 129 void *ah;
diff --git a/drivers/net/wireless/ath/ath5k/ath5k.h b/drivers/net/wireless/ath/ath5k/ath5k.h
index e303db7ee6f..266e548acf7 100644
--- a/drivers/net/wireless/ath/ath5k/ath5k.h
+++ b/drivers/net/wireless/ath/ath5k/ath5k.h
@@ -1155,6 +1155,12 @@ struct ath5k_hw {
1155 struct ath5k_rx_status *); 1155 struct ath5k_rx_status *);
1156}; 1156};
1157 1157
1158struct ath_bus_ops {
1159 enum ath_bus_type ath_bus_type;
1160 void (*read_cachesize)(struct ath_common *common, int *csz);
1161 bool (*eeprom_read)(struct ath_common *common, u32 off, u16 *data);
1162};
1163
1158/* 1164/*
1159 * Prototypes 1165 * Prototypes
1160 */ 1166 */
diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h
index a778b66f443..073bc9e1c79 100644
--- a/drivers/net/wireless/ath/ath9k/hw.h
+++ b/drivers/net/wireless/ath/ath9k/hw.h
@@ -846,6 +846,14 @@ struct ath_hw {
846 u32 ent_mode; 846 u32 ent_mode;
847}; 847};
848 848
849struct ath_bus_ops {
850 enum ath_bus_type ath_bus_type;
851 void (*read_cachesize)(struct ath_common *common, int *csz);
852 bool (*eeprom_read)(struct ath_common *common, u32 off, u16 *data);
853 void (*bt_coex_prep)(struct ath_common *common);
854 void (*extn_synch_en)(struct ath_common *common);
855};
856
849static inline struct ath_common *ath9k_hw_common(struct ath_hw *ah) 857static inline struct ath_common *ath9k_hw_common(struct ath_hw *ah)
850{ 858{
851 return &ah->common; 859 return &ah->common;