Merge tag 'spi-v4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi

[karo-tx-linux.git] / drivers / isdn / hisax / arcofi.c

diff --git a/drivers/isdn/hisax/arcofi.c b/drivers/isdn/hisax/arcofi.c
index 29ec2dfbd155521022438964f24ea91ff333926d..9826bad49e2c1f60f11108661ecb610bcaf878b2 100644 (file)
--- a/drivers/isdn/hisax/arcofi.c
+++ b/drivers/isdn/hisax/arcofi.c
@@ -125,9 +125,7 @@ clear_arcofi(struct IsdnCardState *cs) {
 
 void
 init_arcofi(struct IsdnCardState *cs) {
-       cs->dc.isac.arcofitimer.function = (void *) arcofi_timer;
-       cs->dc.isac.arcofitimer.data = (long) cs;
-       init_timer(&cs->dc.isac.arcofitimer);
+       setup_timer(&cs->dc.isac.arcofitimer, (void *)arcofi_timer, (long)cs);
        init_waitqueue_head(&cs->dc.isac.arcofi_wait);
        test_and_set_bit(HW_ARCOFI, &cs->HW_Flags);
 }