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

Commit aaa1ec46 authored by Sujith Manoharan's avatar Sujith Manoharan Committed by John W. Linville
Browse files

ath9k: Prune ath9k_init_device 



Instead of cluttering ath9k_init_device() with 'ath_softc'
specific initialization code, use ath9k_init_softc() to
setup driver-specific work routines, timers etc.

Signed-off-by: default avatarSujith Manoharan <c_manoha@qca.qualcomm.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 2e8d397e

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

+7 −8
Original line number Original line Diff line number Diff line
@@ -489,6 +489,7 @@ static void ath9k_init_misc(struct ath_softc *sc) 




	setup_timer(&common->ani.timer, ath_ani_calibrate, (unsigned long)sc);

	setup_timer(&common->ani.timer, ath_ani_calibrate, (unsigned long)sc);





	sc->last_rssi = ATH_RSSI_DUMMY_MARKER;

	sc->config.txpowlimit = ATH_TXPOWER_MAX;

	sc->config.txpowlimit = ATH_TXPOWER_MAX;

	memcpy(common->bssidmask, ath_bcast_mac, ETH_ALEN);

	memcpy(common->bssidmask, ath_bcast_mac, ETH_ALEN);

	sc->beacon.slottime = ATH9K_SLOT_TIME_9;

	sc->beacon.slottime = ATH9K_SLOT_TIME_9;
@@ -560,6 +561,12 @@ static int ath9k_init_softc(u16 devid, struct ath_softc *sc, 
	tasklet_init(&sc->bcon_tasklet, ath_beacon_tasklet,

	tasklet_init(&sc->bcon_tasklet, ath_beacon_tasklet,

		     (unsigned long)sc);

		     (unsigned long)sc);





	INIT_WORK(&sc->hw_reset_work, ath_reset_work);

	INIT_WORK(&sc->hw_check_work, ath_hw_check);

	INIT_WORK(&sc->paprd_work, ath_paprd_calibrate);

	INIT_DELAYED_WORK(&sc->hw_pll_work, ath_hw_pll_work);

	setup_timer(&sc->rx_poll_timer, ath_rx_poll, (unsigned long)sc);



	/*

	/*

	 * Cache line size is used to size and align various

	 * Cache line size is used to size and align various

	 * structures used to communicate with the hardware.

	 * structures used to communicate with the hardware.
@@ -782,11 +789,6 @@ int ath9k_init_device(u16 devid, struct ath_softc *sc, 
		ARRAY_SIZE(ath9k_tpt_blink));

		ARRAY_SIZE(ath9k_tpt_blink));

#endif

#endif





	INIT_WORK(&sc->hw_reset_work, ath_reset_work);

	INIT_WORK(&sc->hw_check_work, ath_hw_check);

	INIT_WORK(&sc->paprd_work, ath_paprd_calibrate);

	INIT_DELAYED_WORK(&sc->hw_pll_work, ath_hw_pll_work);



	/* Register with mac80211 */

	/* Register with mac80211 */

	error = ieee80211_register_hw(hw);

	error = ieee80211_register_hw(hw);

	if (error)

	if (error)
@@ -805,9 +807,6 @@ int ath9k_init_device(u16 devid, struct ath_softc *sc, 
			goto error_world;

			goto error_world;

	}

	}





	setup_timer(&sc->rx_poll_timer, ath_rx_poll, (unsigned long)sc);

	sc->last_rssi = ATH_RSSI_DUMMY_MARKER;



	ath_init_leds(sc);

	ath_init_leds(sc);

	ath_start_rfkill_poll(sc);

	ath_start_rfkill_poll(sc);