commit 74e0e3d12265fc676fa9e77b957f5595f7efd785 Author: Jiri Slaby Date: Mon Jun 25 12:33:08 2007 +0200 timers cleanup diff --git a/ath/if_ath_pci.c b/ath/if_ath_pci.c index e32e3eb..6fffdbd 100644 --- a/ath/if_ath_pci.c +++ b/ath/if_ath_pci.c @@ -720,22 +720,15 @@ static int ath_attach(struct pci_dev *pdev, struct ieee80211_hw *hw) goto bad2; } - init_timer(&sc->sc_scan_ch); - sc->sc_scan_ch.function = ath_next_scan; - sc->sc_scan_ch.data = (unsigned long)hw; - - init_timer(&sc->sc_cal_ch); - sc->sc_cal_ch.function = ath_calibrate; - sc->sc_cal_ch.data = (unsigned long)hw; - - sc->sc_blinking = 0; - sc->sc_ledstate = 1; - sc->sc_ledon = 0; /* low true */ - sc->sc_ledidle = (2700*HZ)/1000; /* 2.7sec */ - - init_timer(&sc->sc_ledtimer); - sc->sc_ledtimer.function = ath_led_off; - sc->sc_ledtimer.data = (unsigned long) sc; + setup_timer(&sc->scan_ch, ath_next_scan, (unsigned long)hw); + setup_timer(&sc->cal_ch, ath_calibrate, (unsigned long)hw); + + sc->blinking = 0; + sc->ledstate = 1; + sc->ledon = 0; /* low true */ + sc->ledidle = (2700*HZ)/1000; /* 2.7sec */ + + setup_timer(&sc->sc_ledtimer, ath_led_off, (unsigned long)sc); /* * Auto-enable soft led processing for IBM cards and for * 5211 minipci cards. Users can also manually enable/disable