Commit bc974f4a authored by Luis R. Rodriguez's avatar Luis R. Rodriguez Committed by John W. Linville
Browse files

atheros: define a common priv struct 



hw code should never use private driver data, but
sometimes we need a backpointer so just stuff it on
the common ath struct.

Signed-off-by: default avatarLuis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 7c89606e

drivers/net/wireless/ath/ath.h

+1 −0
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ struct ath_bus_ops { 


struct ath_common {

	void *ah;

	void *priv;

	struct ieee80211_hw *hw;

	int debug_mask;

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

+4 −3
Original line number Diff line number Diff line
@@ -562,8 +562,8 @@ static const struct file_operations fops_xmit = { 


int ath9k_init_debug(struct ath_hw *ah)

{

	struct ath_softc *sc = ah->ah_sc;

	struct ath_common *common = ath9k_hw_common(sc->sc_ah);

	struct ath_common *common = ath9k_hw_common(ah);

	struct ath_softc *sc = (struct ath_softc *) common->priv;



	common->debug_mask = ath9k_debug;
@@ -620,7 +620,8 @@ err: 


void ath9k_exit_debug(struct ath_hw *ah)

{

	struct ath_softc *sc = ah->ah_sc;

	struct ath_common *common = ath9k_hw_common(ah);

	struct ath_softc *sc = (struct ath_softc *) common->priv;



	debugfs_remove(sc->debug.debugfs_xmit);

	debugfs_remove(sc->debug.debugfs_wiphy);

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

+0 −1
Original line number Diff line number Diff line
@@ -450,7 +450,6 @@ struct ath_gen_timer_table { 


struct ath_hw {

	struct ieee80211_hw *hw;

	struct ath_softc *ah_sc;

	struct ath_common common;

	struct ath9k_hw_version hw_version;

	struct ath9k_ops_config config;

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

+23 −14
Original line number Diff line number Diff line
@@ -1438,17 +1438,22 @@ static void ath9k_gen_timer_start(struct ath_hw *ah, 
				  u32 timer_next,

				  u32 timer_period)

{

	struct ath_common *common = ath9k_hw_common(ah);

	struct ath_softc *sc = (struct ath_softc *) common->priv;



	ath9k_hw_gen_timer_start(ah, timer, timer_next, timer_period);



	if ((ah->ah_sc->imask & ATH9K_INT_GENTIMER) == 0) {

	if ((sc->imask & ATH9K_INT_GENTIMER) == 0) {

		ath9k_hw_set_interrupts(ah, 0);

		ah->ah_sc->imask |= ATH9K_INT_GENTIMER;

		ath9k_hw_set_interrupts(ah, ah->ah_sc->imask);

		sc->imask |= ATH9K_INT_GENTIMER;

		ath9k_hw_set_interrupts(ah, sc->imask);

	}

}



static void ath9k_gen_timer_stop(struct ath_hw *ah, struct ath_gen_timer *timer)

{

	struct ath_common *common = ath9k_hw_common(ah);

	struct ath_softc *sc = (struct ath_softc *) common->priv;

	struct ath_gen_timer_table *timer_table = &ah->hw_gen_timers;



	ath9k_hw_gen_timer_stop(ah, timer);
@@ -1456,8 +1461,8 @@ static void ath9k_gen_timer_stop(struct ath_hw *ah, struct ath_gen_timer *timer) 
	/* if no timer is enabled, turn off interrupt mask */

	if (timer_table->timer_mask.val == 0) {

		ath9k_hw_set_interrupts(ah, 0);

		ah->ah_sc->imask &= ~ATH9K_INT_GENTIMER;

		ath9k_hw_set_interrupts(ah, ah->ah_sc->imask);

		sc->imask &= ~ATH9K_INT_GENTIMER;

		ath9k_hw_set_interrupts(ah, sc->imask);

	}

}
@@ -1554,28 +1559,32 @@ static int ath_init_btcoex_timer(struct ath_softc *sc) 
static void ath9k_iowrite32(void *hw_priv, u32 val, u32 reg_offset)

{

	struct ath_hw *ah = (struct ath_hw *) hw_priv;

	struct ath_common *common = ath9k_hw_common(ah);

	struct ath_softc *sc = (struct ath_softc *) common->priv;



	if (ah->config.serialize_regmode == SER_REG_MODE_ON) {

		unsigned long flags;

		spin_lock_irqsave(&ah->ah_sc->sc_serial_rw, flags);

		iowrite32(val, ah->ah_sc->mem + reg_offset);

		spin_unlock_irqrestore(&ah->ah_sc->sc_serial_rw, flags);

		spin_lock_irqsave(&sc->sc_serial_rw, flags);

		iowrite32(val, sc->mem + reg_offset);

		spin_unlock_irqrestore(&sc->sc_serial_rw, flags);

	} else

		iowrite32(val, ah->ah_sc->mem + reg_offset);

		iowrite32(val, sc->mem + reg_offset);

}



static unsigned int ath9k_ioread32(void *hw_priv, u32 reg_offset)

{

	struct ath_hw *ah = (struct ath_hw *) hw_priv;

	struct ath_common *common = ath9k_hw_common(ah);

	struct ath_softc *sc = (struct ath_softc *) common->priv;

	u32 val;



	if (ah->config.serialize_regmode == SER_REG_MODE_ON) {

		unsigned long flags;

		spin_lock_irqsave(&ah->ah_sc->sc_serial_rw, flags);

		val = ioread32(ah->ah_sc->mem + reg_offset);

		spin_unlock_irqrestore(&ah->ah_sc->sc_serial_rw, flags);

		spin_lock_irqsave(&sc->sc_serial_rw, flags);

		val = ioread32(sc->mem + reg_offset);

		spin_unlock_irqrestore(&sc->sc_serial_rw, flags);

	} else

		val = ioread32(ah->ah_sc->mem + reg_offset);

		val = ioread32(sc->mem + reg_offset);

	return val;

}
@@ -1618,7 +1627,6 @@ static int ath_init_softc(u16 devid, struct ath_softc *sc, u16 subsysid, 
		goto bad_no_ah;

	}



	ah->ah_sc = sc;

	ah->hw_version.devid = devid;

	ah->hw_version.subsysid = subsysid;

	sc->sc_ah = ah;
@@ -1628,6 +1636,7 @@ static int ath_init_softc(u16 devid, struct ath_softc *sc, u16 subsysid, 
	common->bus_ops = bus_ops;

	common->ah = ah;

	common->hw = sc->hw;

	common->priv = sc;



	/*

	 * Cache line size is used to size and align various

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

+3 −6
Original line number Diff line number Diff line
@@ -33,8 +33,7 @@ static struct pci_device_id ath_pci_id_table[] __devinitdata = { 
/* return bus cachesize in 4B word units */

static void ath_pci_read_cachesize(struct ath_common *common, int *csz)

{

	struct ath_hw *ah = (struct ath_hw *) common->ah;

	struct ath_softc *sc = ah->ah_sc;

	struct ath_softc *sc = (struct ath_softc *) common->priv;

	u8 u8tmp;



	pci_read_config_byte(to_pci_dev(sc->dev), PCI_CACHE_LINE_SIZE, &u8tmp);
@@ -52,8 +51,7 @@ static void ath_pci_read_cachesize(struct ath_common *common, int *csz) 


static void ath_pci_cleanup(struct ath_common *common)

{

	struct ath_hw *ah = (struct ath_hw *) common->ah;

	struct ath_softc *sc = ah->ah_sc;

	struct ath_softc *sc = (struct ath_softc *) common->priv;

	struct pci_dev *pdev = to_pci_dev(sc->dev);



	pci_iounmap(pdev, sc->mem);
@@ -86,8 +84,7 @@ static bool ath_pci_eeprom_read(struct ath_common *common, u32 off, u16 *data) 
 */

static void ath_pci_bt_coex_prep(struct ath_common *common)

{

	struct ath_hw *ah = (struct ath_hw *) common->ah;

	struct ath_softc *sc = ah->ah_sc;

	struct ath_softc *sc = (struct ath_softc *) common->priv;

	struct pci_dev *pdev = to_pci_dev(sc->dev);

	u8 aspm;

CRA Git | Maintained and supported by SUSTech CRA and CCSE