Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eb93e891 authored by Pavel Roskin's avatar Pavel Roskin Committed by John W. Linville
Browse files

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



Signed-off-by: default avatarPavel Roskin <proski@gnu.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent a3e72cd2

drivers/net/wireless/ath/ath9k/ahb.c

+1 −1
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ static int ath_ahb_probe(struct platform_device *pdev) 
		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) {

		dev_err(&pdev->dev, "failed to initialize device\n");

		goto err_irq;

drivers/net/wireless/ath/ath9k/ath9k.h

+1 −1
Original line number Diff line number Diff line
@@ -669,7 +669,7 @@ extern bool is_ath9k_unloaded; 


irqreturn_t ath_isr(int irq, void *dev);

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);

void ath9k_deinit_device(struct ath_softc *sc);

void ath9k_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw);

drivers/net/wireless/ath/ath9k/htc_drv_init.c

+0 −1
Original line number Diff line number Diff line
@@ -666,7 +666,6 @@ static int ath9k_init_priv(struct ath9k_htc_priv *priv, 
		return -ENOMEM;



	ah->hw_version.devid = devid;

	ah->hw_version.subsysid = 0; /* FIXME */

	ah->hw_version.usbdev = drv_info;

	ah->ah_flags |= AH_USE_EEPROM;

	ah->reg_ops.read = ath9k_regread;

drivers/net/wireless/ath/ath9k/hw.h

+0 −1
Original line number Diff line number Diff line
@@ -438,7 +438,6 @@ struct ath9k_hw_version { 
	u16 phyRev;

	u16 analog5GhzRev;

	u16 analog2GhzRev;

	u16 subsysid;

	enum ath_usb_dev usbdev;

};

drivers/net/wireless/ath/ath9k/init.c

+3 −4
Original line number Diff line number Diff line
@@ -548,7 +548,7 @@ static void ath9k_init_misc(struct ath_softc *sc) 
		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)

{

	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_version.devid = devid;

	ah->hw_version.subsysid = subsysid;

	ah->reg_ops.read = ath9k_ioread32;

	ah->reg_ops.write = ath9k_iowrite32;

	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);

}



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)

{

	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;



	/* Bring up device */

	error = ath9k_init_softc(devid, sc, subsysid, bus_ops);

	error = ath9k_init_softc(devid, sc, bus_ops);

	if (error != 0)

		goto error_init;