This can be used to store the bus types ( AHB/PCI/USB ).
Signed-off-by: Sujith <[email protected]>
---
drivers/net/wireless/ath/ath.h | 13 ++++++++++---
drivers/net/wireless/ath/ath9k/ahb.c | 1 +
drivers/net/wireless/ath/ath9k/htc_drv_init.c | 1 +
drivers/net/wireless/ath/ath9k/pci.c | 1 +
4 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/drivers/net/wireless/ath/ath.h b/drivers/net/wireless/ath/ath.h
index 71fc960..1fbf6b1 100644
--- a/drivers/net/wireless/ath/ath.h
+++ b/drivers/net/wireless/ath/ath.h
@@ -48,6 +48,12 @@ enum ath_device_state {
ATH_HW_INITIALIZED,
};
+enum ath_bus_type {
+ ATH_PCI,
+ ATH_AHB,
+ ATH_USB,
+};
+
struct reg_dmn_pair_mapping {
u16 regDmnEnum;
u16 reg_5ghz_ctl;
@@ -73,9 +79,10 @@ struct ath_ops {
struct ath_common;
struct ath_bus_ops {
- 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);
+ 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);
};
struct ath_common {
diff --git a/drivers/net/wireless/ath/ath9k/ahb.c b/drivers/net/wireless/ath/ath9k/ahb.c
index ca4994f..85fdd26 100644
--- a/drivers/net/wireless/ath/ath9k/ahb.c
+++ b/drivers/net/wireless/ath/ath9k/ahb.c
@@ -47,6 +47,7 @@ static bool ath_ahb_eeprom_read(struct ath_common *common, u32 off, u16 *data)
}
static struct ath_bus_ops ath_ahb_bus_ops = {
+ .ath_bus_type = ATH_AHB,
.read_cachesize = ath_ahb_read_cachesize,
.eeprom_read = ath_ahb_eeprom_read,
};
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_init.c b/drivers/net/wireless/ath/ath9k/htc_drv_init.c
index 90cfd90..e268d45 100644
--- a/drivers/net/wireless/ath/ath9k/htc_drv_init.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_init.c
@@ -287,6 +287,7 @@ static bool ath_usb_eeprom_read(struct ath_common *common, u32 off, u16 *data)
}
static const struct ath_bus_ops ath9k_usb_bus_ops = {
+ .ath_bus_type = ATH_USB,
.read_cachesize = ath_usb_read_cachesize,
.eeprom_read = ath_usb_eeprom_read,
};
diff --git a/drivers/net/wireless/ath/ath9k/pci.c b/drivers/net/wireless/ath/ath9k/pci.c
index 9441c67..1ec836c 100644
--- a/drivers/net/wireless/ath/ath9k/pci.c
+++ b/drivers/net/wireless/ath/ath9k/pci.c
@@ -88,6 +88,7 @@ static void ath_pci_bt_coex_prep(struct ath_common *common)
}
static const struct ath_bus_ops ath_pci_bus_ops = {
+ .ath_bus_type = ATH_PCI,
.read_cachesize = ath_pci_read_cachesize,
.eeprom_read = ath_pci_eeprom_read,
.bt_coex_prep = ath_pci_bt_coex_prep,
--
1.7.0.3
On Tue, 2010-04-06 at 15:47 +0530, Sujith wrote:
> Sorry, I just noticed this mail.
> A number of pending patches are on top of this one.
> Maybe this can be done later ?
Sure, there is no immediate problem with the short names.
--
Regards,
Pavel Roskin
On Thu, 2010-04-01 at 10:28 +0530, Sujith wrote:
> This can be used to store the bus types ( AHB/PCI/USB ).
> +enum ath_bus_type {
> + ATH_PCI,
> + ATH_AHB,
> + ATH_USB,
> +};
I like the idea, but let's have ATH_BUS_PCI, ATH_BUS_AHB and
ATH_BUS_USB. This way, one would be able to grep for "ATH_BUS_" to find
all occurrences of those symbols.
There are already symbols starting with "ATH_PCI", such as
ATH_PCIE_CAP_LINK_CTRL.
--
Regards,
Pavel Roskin
Pavel Roskin wrote:
> On Thu, 2010-04-01 at 10:28 +0530, Sujith wrote:
> > This can be used to store the bus types ( AHB/PCI/USB ).
>
> > +enum ath_bus_type {
> > + ATH_PCI,
> > + ATH_AHB,
> > + ATH_USB,
> > +};
>
> I like the idea, but let's have ATH_BUS_PCI, ATH_BUS_AHB and
> ATH_BUS_USB. This way, one would be able to grep for "ATH_BUS_" to find
> all occurrences of those symbols.
>
> There are already symbols starting with "ATH_PCI", such as
> ATH_PCIE_CAP_LINK_CTRL.
Sorry, I just noticed this mail.
A number of pending patches are on top of this one.
Maybe this can be done later ?
Sujith