xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ath9k: remove all references to subsysid, it's never used

Browse Source 
Signed-off-by: Pavel Roskin <proski@gnu.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Pavel Roskin
2011-07-23 03:55:39 -04:00
committed by John W. Linville
parent a3e72cd297
commit eb93e89182
6 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/wireless/ath/ath9k/ahb.c
View File

@@ -133,7 +133,7 @@ static int ath_ahb_probe(struct platform_device *pdev)
goto err_free_hw; goto err_free_hw;
} }
ret = ath9k_init_device(id->driver_data, sc, 0x0, &ath_ahb_bus_ops); ret = ath9k_init_device(id->driver_data, sc, &ath_ahb_bus_ops);
if (ret) { if (ret) {
dev_err(&pdev->dev, "failed to initialize device\n"); dev_err(&pdev->dev, "failed to initialize device\n");
goto err_irq; goto err_irq;

2
drivers/net/wireless/ath/ath9k/ath9k.h
View File

@@ -669,7 +669,7 @@ extern bool is_ath9k_unloaded;
irqreturn_t ath_isr(int irq, void *dev); irqreturn_t ath_isr(int irq, void *dev);
void ath9k_init_crypto(struct ath_softc *sc); void ath9k_init_crypto(struct ath_softc *sc);
int ath9k_init_device(u16 devid, struct ath_softc *sc, u16 subsysid, int ath9k_init_device(u16 devid, struct ath_softc *sc,
const struct ath_bus_ops *bus_ops); const struct ath_bus_ops *bus_ops);
void ath9k_deinit_device(struct ath_softc *sc); void ath9k_deinit_device(struct ath_softc *sc);
void ath9k_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw); void ath9k_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw);

1
drivers/net/wireless/ath/ath9k/htc_drv_init.c
View File

@@ -666,7 +666,6 @@ static int ath9k_init_priv(struct ath9k_htc_priv *priv,
return -ENOMEM; return -ENOMEM;
ah->hw_version.devid = devid; ah->hw_version.devid = devid;
ah->hw_version.subsysid = 0; /* FIXME */
ah->hw_version.usbdev = drv_info; ah->hw_version.usbdev = drv_info;
ah->ah_flags |= AH_USE_EEPROM; ah->ah_flags |= AH_USE_EEPROM;
ah->reg_ops.read = ath9k_regread; ah->reg_ops.read = ath9k_regread;

1
drivers/net/wireless/ath/ath9k/hw.h
View File

@@ -438,7 +438,6 @@ struct ath9k_hw_version {
u16 phyRev; u16 phyRev;
u16 analog5GhzRev; u16 analog5GhzRev;
u16 analog2GhzRev; u16 analog2GhzRev;
u16 subsysid;
enum ath_usb_dev usbdev; enum ath_usb_dev usbdev;
}; };

7
drivers/net/wireless/ath/ath9k/init.c
View File

@@ -548,7 +548,7 @@ static void ath9k_init_misc(struct ath_softc *sc)
sc->ant_comb.count = ATH_ANT_DIV_COMB_INIT_COUNT; sc->ant_comb.count = ATH_ANT_DIV_COMB_INIT_COUNT;
} }
static int ath9k_init_softc(u16 devid, struct ath_softc *sc, u16 subsysid, static int ath9k_init_softc(u16 devid, struct ath_softc *sc,
const struct ath_bus_ops *bus_ops) const struct ath_bus_ops *bus_ops)
{ {
struct ath9k_platform_data *pdata = sc->dev->platform_data; struct ath9k_platform_data *pdata = sc->dev->platform_data;
@@ -563,7 +563,6 @@ static int ath9k_init_softc(u16 devid, struct ath_softc *sc, u16 subsysid,
ah->hw = sc->hw; ah->hw = sc->hw;
ah->hw_version.devid = devid; ah->hw_version.devid = devid;
ah->hw_version.subsysid = subsysid;
ah->reg_ops.read = ath9k_ioread32; ah->reg_ops.read = ath9k_ioread32;
ah->reg_ops.write = ath9k_iowrite32; ah->reg_ops.write = ath9k_iowrite32;
ah->reg_ops.rmw = ath9k_reg_rmw; ah->reg_ops.rmw = ath9k_reg_rmw;
@@ -743,7 +742,7 @@ void ath9k_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw)
SET_IEEE80211_PERM_ADDR(hw, common->macaddr); SET_IEEE80211_PERM_ADDR(hw, common->macaddr);
} }
int ath9k_init_device(u16 devid, struct ath_softc *sc, u16 subsysid, int ath9k_init_device(u16 devid, struct ath_softc *sc,
const struct ath_bus_ops *bus_ops) const struct ath_bus_ops *bus_ops)
{ {
struct ieee80211_hw *hw = sc->hw; struct ieee80211_hw *hw = sc->hw;
@@ -753,7 +752,7 @@ int ath9k_init_device(u16 devid, struct ath_softc *sc, u16 subsysid,
struct ath_regulatory *reg; struct ath_regulatory *reg;
/* Bring up device */ /* Bring up device */
error = ath9k_init_softc(devid, sc, subsysid, bus_ops); error = ath9k_init_softc(devid, sc, bus_ops);
if (error != 0) if (error != 0)
goto error_init; goto error_init;

3
drivers/net/wireless/ath/ath9k/pci.c
View File

@@ -249,8 +249,7 @@ static int ath_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
sc->irq = pdev->irq; sc->irq = pdev->irq;
ret = ath9k_init_device(id->device, sc, pdev->subsystem_device, ret = ath9k_init_device(id->device, sc, &ath_pci_bus_ops);
&ath_pci_bus_ops);
if (ret) { if (ret) {
dev_err(&pdev->dev, "Failed to initialize device\n"); dev_err(&pdev->dev, "Failed to initialize device\n");
goto err_init; goto err_init;