diff options
Diffstat (limited to 'drivers/atm/idt77252.c')
-rw-r--r-- | drivers/atm/idt77252.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/atm/idt77252.c b/drivers/atm/idt77252.c index 0e3b9c44c808..0277f36be85b 100644 --- a/drivers/atm/idt77252.c +++ b/drivers/atm/idt77252.c | |||
@@ -1528,9 +1528,9 @@ idt77252_tx(struct idt77252_dev *card) | |||
1528 | 1528 | ||
1529 | 1529 | ||
1530 | static void | 1530 | static void |
1531 | tst_timer(unsigned long data) | 1531 | tst_timer(struct timer_list *t) |
1532 | { | 1532 | { |
1533 | struct idt77252_dev *card = (struct idt77252_dev *)data; | 1533 | struct idt77252_dev *card = from_timer(card, t, tst_timer); |
1534 | unsigned long base, idle, jump; | 1534 | unsigned long base, idle, jump; |
1535 | unsigned long flags; | 1535 | unsigned long flags; |
1536 | u32 pc; | 1536 | u32 pc; |
@@ -3634,7 +3634,7 @@ static int idt77252_init_one(struct pci_dev *pcidev, | |||
3634 | spin_lock_init(&card->cmd_lock); | 3634 | spin_lock_init(&card->cmd_lock); |
3635 | spin_lock_init(&card->tst_lock); | 3635 | spin_lock_init(&card->tst_lock); |
3636 | 3636 | ||
3637 | setup_timer(&card->tst_timer, tst_timer, (unsigned long)card); | 3637 | timer_setup(&card->tst_timer, tst_timer, 0); |
3638 | 3638 | ||
3639 | /* Do the I/O remapping... */ | 3639 | /* Do the I/O remapping... */ |
3640 | card->membase = ioremap(membase, 1024); | 3640 | card->membase = ioremap(membase, 1024); |