Skip to content

Commit

Permalink
ath: unshare struct ath_bus_ops between ath5k and ath9k
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Felix Fietkau authored and John W. Linville committed Apr 14, 2011
1 parent 7f94f05 commit 0cb9e06
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 8 deletions.
9 changes: 1 addition & 8 deletions drivers/net/wireless/ath/ath.h
Original file line number Diff line number Diff line change
Expand Up @@ -123,14 +123,7 @@ struct ath_ops {
};

struct ath_common;

struct ath_bus_ops {
enum ath_bus_type ath_bus_type;
void (*read_cachesize)(struct ath_common *common, int *csz);
bool (*eeprom_read)(struct ath_common *common, u32 off, u16 *data);
void (*bt_coex_prep)(struct ath_common *common);
void (*extn_synch_en)(struct ath_common *common);
};
struct ath_bus_ops;

struct ath_common {
void *ah;
Expand Down
6 changes: 6 additions & 0 deletions drivers/net/wireless/ath/ath5k/ath5k.h
Original file line number Diff line number Diff line change
Expand Up @@ -1155,6 +1155,12 @@ struct ath5k_hw {
struct ath5k_rx_status *);
};

struct ath_bus_ops {
enum ath_bus_type ath_bus_type;
void (*read_cachesize)(struct ath_common *common, int *csz);
bool (*eeprom_read)(struct ath_common *common, u32 off, u16 *data);
};

/*
* Prototypes
*/
Expand Down
8 changes: 8 additions & 0 deletions drivers/net/wireless/ath/ath9k/hw.h
Original file line number Diff line number Diff line change
Expand Up @@ -846,6 +846,14 @@ struct ath_hw {
u32 ent_mode;
};

struct ath_bus_ops {
enum ath_bus_type ath_bus_type;
void (*read_cachesize)(struct ath_common *common, int *csz);
bool (*eeprom_read)(struct ath_common *common, u32 off, u16 *data);
void (*bt_coex_prep)(struct ath_common *common);
void (*extn_synch_en)(struct ath_common *common);
};

static inline struct ath_common *ath9k_hw_common(struct ath_hw *ah)
{
return &ah->common;
Expand Down

0 comments on commit 0cb9e06

Please sign in to comment.