Commit cb9f780a authored by Kees Cook's avatar Kees Cook Committed by Heiko Carstens
Browse files

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: default avatarKees Cook <keescook@chromium.org>
[sebott: fixed compile error due to invalid struct member]
Signed-off-by: default avatarSebastian Ott <sebott@linux.vnet.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
parent 894025f2

drivers/s390/cio/qdio.h

+1 −1
Original line number Diff line number Diff line
@@ -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,

drivers/s390/cio/qdio_main.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

}

drivers/s390/cio/qdio_setup.c

+1 −2
Original line number Diff line number Diff line
@@ -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);

	}

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE