diff options
author | Pavel Roskin <proski@gnu.org> | 2011-07-23 03:55:39 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-08-08 16:03:51 -0400 |
commit | eb93e891825d0297fddcb76dbb0fff6a5a107bb6 (patch) | |
tree | 8eed8c62685423a2730b04f00c178b983cdfdd7d /drivers/net/wireless/ath | |
parent | a3e72cd2974a4b178d4edf6737ae51d1ea83b5d8 (diff) |
ath9k: remove all references to subsysid, it's never used
Signed-off-by: Pavel Roskin <proski@gnu.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/ahb.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath9k/ath9k.h | 2 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath9k/htc_drv_init.c | 1 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath9k/hw.h | 1 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath9k/init.c | 7 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath9k/pci.c | 3 |
6 files changed, 6 insertions, 10 deletions
diff --git a/drivers/net/wireless/ath/ath9k/ahb.c b/drivers/net/wireless/ath/ath9k/ahb.c index 0b36fcf8a28..85a54cd2b08 100644 --- a/drivers/net/wireless/ath/ath9k/ahb.c +++ b/drivers/net/wireless/ath/ath9k/ahb.c | |||
@@ -133,7 +133,7 @@ static int ath_ahb_probe(struct platform_device *pdev) | |||
133 | goto err_free_hw; | 133 | goto err_free_hw; |
134 | } | 134 | } |
135 | 135 | ||
136 | ret = ath9k_init_device(id->driver_data, sc, 0x0, &ath_ahb_bus_ops); | 136 | ret = ath9k_init_device(id->driver_data, sc, &ath_ahb_bus_ops); |
137 | if (ret) { | 137 | if (ret) { |
138 | dev_err(&pdev->dev, "failed to initialize device\n"); | 138 | dev_err(&pdev->dev, "failed to initialize device\n"); |
139 | goto err_irq; | 139 | goto err_irq; |
diff --git a/drivers/net/wireless/ath/ath9k/ath9k.h b/drivers/net/wireless/ath/ath9k/ath9k.h index 46393f90f16..930e29b9e2c 100644 --- a/drivers/net/wireless/ath/ath9k/ath9k.h +++ b/drivers/net/wireless/ath/ath9k/ath9k.h | |||
@@ -669,7 +669,7 @@ extern bool is_ath9k_unloaded; | |||
669 | 669 | ||
670 | irqreturn_t ath_isr(int irq, void *dev); | 670 | irqreturn_t ath_isr(int irq, void *dev); |
671 | void ath9k_init_crypto(struct ath_softc *sc); | 671 | void ath9k_init_crypto(struct ath_softc *sc); |
672 | int ath9k_init_device(u16 devid, struct ath_softc *sc, u16 subsysid, | 672 | int ath9k_init_device(u16 devid, struct ath_softc *sc, |
673 | const struct ath_bus_ops *bus_ops); | 673 | const struct ath_bus_ops *bus_ops); |
674 | void ath9k_deinit_device(struct ath_softc *sc); | 674 | void ath9k_deinit_device(struct ath_softc *sc); |
675 | void ath9k_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw); | 675 | void ath9k_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw); |
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_init.c b/drivers/net/wireless/ath/ath9k/htc_drv_init.c index 3bea7ea86f0..19aa5b72488 100644 --- a/drivers/net/wireless/ath/ath9k/htc_drv_init.c +++ b/drivers/net/wireless/ath/ath9k/htc_drv_init.c | |||
@@ -666,7 +666,6 @@ static int ath9k_init_priv(struct ath9k_htc_priv *priv, | |||
666 | return -ENOMEM; | 666 | return -ENOMEM; |
667 | 667 | ||
668 | ah->hw_version.devid = devid; | 668 | ah->hw_version.devid = devid; |
669 | ah->hw_version.subsysid = 0; /* FIXME */ | ||
670 | ah->hw_version.usbdev = drv_info; | 669 | ah->hw_version.usbdev = drv_info; |
671 | ah->ah_flags |= AH_USE_EEPROM; | 670 | ah->ah_flags |= AH_USE_EEPROM; |
672 | ah->reg_ops.read = ath9k_regread; | 671 | ah->reg_ops.read = ath9k_regread; |
diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h index c79889036ec..c2bbd02ec6b 100644 --- a/drivers/net/wireless/ath/ath9k/hw.h +++ b/drivers/net/wireless/ath/ath9k/hw.h | |||
@@ -438,7 +438,6 @@ struct ath9k_hw_version { | |||
438 | u16 phyRev; | 438 | u16 phyRev; |
439 | u16 analog5GhzRev; | 439 | u16 analog5GhzRev; |
440 | u16 analog2GhzRev; | 440 | u16 analog2GhzRev; |
441 | u16 subsysid; | ||
442 | enum ath_usb_dev usbdev; | 441 | enum ath_usb_dev usbdev; |
443 | }; | 442 | }; |
444 | 443 | ||
diff --git a/drivers/net/wireless/ath/ath9k/init.c b/drivers/net/wireless/ath/ath9k/init.c index aa0ff7e2c92..d99f188dfcf 100644 --- a/drivers/net/wireless/ath/ath9k/init.c +++ b/drivers/net/wireless/ath/ath9k/init.c | |||
@@ -548,7 +548,7 @@ static void ath9k_init_misc(struct ath_softc *sc) | |||
548 | sc->ant_comb.count = ATH_ANT_DIV_COMB_INIT_COUNT; | 548 | sc->ant_comb.count = ATH_ANT_DIV_COMB_INIT_COUNT; |
549 | } | 549 | } |
550 | 550 | ||
551 | static int ath9k_init_softc(u16 devid, struct ath_softc *sc, u16 subsysid, | 551 | static int ath9k_init_softc(u16 devid, struct ath_softc *sc, |
552 | const struct ath_bus_ops *bus_ops) | 552 | const struct ath_bus_ops *bus_ops) |
553 | { | 553 | { |
554 | struct ath9k_platform_data *pdata = sc->dev->platform_data; | 554 | 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, | |||
563 | 563 | ||
564 | ah->hw = sc->hw; | 564 | ah->hw = sc->hw; |
565 | ah->hw_version.devid = devid; | 565 | ah->hw_version.devid = devid; |
566 | ah->hw_version.subsysid = subsysid; | ||
567 | ah->reg_ops.read = ath9k_ioread32; | 566 | ah->reg_ops.read = ath9k_ioread32; |
568 | ah->reg_ops.write = ath9k_iowrite32; | 567 | ah->reg_ops.write = ath9k_iowrite32; |
569 | ah->reg_ops.rmw = ath9k_reg_rmw; | 568 | ah->reg_ops.rmw = ath9k_reg_rmw; |
@@ -743,7 +742,7 @@ void ath9k_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw) | |||
743 | SET_IEEE80211_PERM_ADDR(hw, common->macaddr); | 742 | SET_IEEE80211_PERM_ADDR(hw, common->macaddr); |
744 | } | 743 | } |
745 | 744 | ||
746 | int ath9k_init_device(u16 devid, struct ath_softc *sc, u16 subsysid, | 745 | int ath9k_init_device(u16 devid, struct ath_softc *sc, |
747 | const struct ath_bus_ops *bus_ops) | 746 | const struct ath_bus_ops *bus_ops) |
748 | { | 747 | { |
749 | struct ieee80211_hw *hw = sc->hw; | 748 | struct ieee80211_hw *hw = sc->hw; |
@@ -753,7 +752,7 @@ int ath9k_init_device(u16 devid, struct ath_softc *sc, u16 subsysid, | |||
753 | struct ath_regulatory *reg; | 752 | struct ath_regulatory *reg; |
754 | 753 | ||
755 | /* Bring up device */ | 754 | /* Bring up device */ |
756 | error = ath9k_init_softc(devid, sc, subsysid, bus_ops); | 755 | error = ath9k_init_softc(devid, sc, bus_ops); |
757 | if (error != 0) | 756 | if (error != 0) |
758 | goto error_init; | 757 | goto error_init; |
759 | 758 | ||
diff --git a/drivers/net/wireless/ath/ath9k/pci.c b/drivers/net/wireless/ath/ath9k/pci.c index 839df305348..5685cf11cfe 100644 --- a/drivers/net/wireless/ath/ath9k/pci.c +++ b/drivers/net/wireless/ath/ath9k/pci.c | |||
@@ -249,8 +249,7 @@ static int ath_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) | |||
249 | 249 | ||
250 | sc->irq = pdev->irq; | 250 | sc->irq = pdev->irq; |
251 | 251 | ||
252 | ret = ath9k_init_device(id->device, sc, pdev->subsystem_device, | 252 | ret = ath9k_init_device(id->device, sc, &ath_pci_bus_ops); |
253 | &ath_pci_bus_ops); | ||
254 | if (ret) { | 253 | if (ret) { |
255 | dev_err(&pdev->dev, "Failed to initialize device\n"); | 254 | dev_err(&pdev->dev, "Failed to initialize device\n"); |
256 | goto err_init; | 255 | goto err_init; |