mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 09:19:51 +00:00
s390: qdio: Convert timers to use timer_setup()
In preparation for unconditionally passing the struct timer_list pointer to all timer callbacks, switch to using the new timer_setup() and from_timer() to pass the timer pointer explicitly. Cc: Peter Oberparleiter <oberpar@linux.vnet.ibm.com> Cc: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Kees Cook <keescook@chromium.org> [sebott: fixed compile error due to invalid struct member] Signed-off-by: Sebastian Ott <sebott@linux.vnet.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com> Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
This commit is contained in:
parent
894025f24b
commit
cb9f780aa9
3 changed files with 4 additions and 5 deletions
|
@ -393,7 +393,7 @@ int test_nonshared_ind(struct qdio_irq *);
|
|||
/* prototypes for setup */
|
||||
void qdio_inbound_processing(unsigned long data);
|
||||
void qdio_outbound_processing(unsigned long data);
|
||||
void qdio_outbound_timer(unsigned long data);
|
||||
void qdio_outbound_timer(struct timer_list *t);
|
||||
void qdio_int_handler(struct ccw_device *cdev, unsigned long intparm,
|
||||
struct irb *irb);
|
||||
int qdio_allocate_qs(struct qdio_irq *irq_ptr, int nr_input_qs,
|
||||
|
|
|
@ -894,9 +894,9 @@ void qdio_outbound_processing(unsigned long data)
|
|||
__qdio_outbound_processing(q);
|
||||
}
|
||||
|
||||
void qdio_outbound_timer(unsigned long data)
|
||||
void qdio_outbound_timer(struct timer_list *t)
|
||||
{
|
||||
struct qdio_q *q = (struct qdio_q *)data;
|
||||
struct qdio_q *q = from_timer(q, t, u.out.timer);
|
||||
|
||||
qdio_tasklet_schedule(q);
|
||||
}
|
||||
|
|
|
@ -252,8 +252,7 @@ static void setup_queues(struct qdio_irq *irq_ptr,
|
|||
|
||||
tasklet_init(&q->tasklet, qdio_outbound_processing,
|
||||
(unsigned long) q);
|
||||
setup_timer(&q->u.out.timer, (void(*)(unsigned long))
|
||||
&qdio_outbound_timer, (unsigned long)q);
|
||||
timer_setup(&q->u.out.timer, qdio_outbound_timer, 0);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue