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

s390/ap_bus: 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: Harald Freudenberger <freude@de.ibm.com>
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
parent c9602ee7

drivers/s390/crypto/ap_bus.c

+5 −5
Original line number Diff line number Diff line
@@ -374,13 +374,13 @@ void ap_wait(enum ap_wait wait) 


/**

 * ap_request_timeout(): Handling of request timeouts

 * @data: Holds the AP device.

 * @t: timer making this callback

 *

 * Handles request timeouts.

 */

void ap_request_timeout(unsigned long data)

void ap_request_timeout(struct timer_list *t)

{

	struct ap_queue *aq = (struct ap_queue *) data;

	struct ap_queue *aq = from_timer(aq, t, timeout);



	if (ap_suspend_flag)

		return;
@@ -1203,7 +1203,7 @@ out: 
	mod_timer(&ap_config_timer, jiffies + ap_config_time * HZ);

}



static void ap_config_timeout(unsigned long ptr)

static void ap_config_timeout(struct timer_list *unused)

{

	if (ap_suspend_flag)

		return;
@@ -1306,7 +1306,7 @@ int __init ap_module_init(void) 
		goto out_bus;



	/* Setup the AP bus rescan timer. */

	setup_timer(&ap_config_timer, ap_config_timeout, 0);

	timer_setup(&ap_config_timer, ap_config_timeout, 0);



	/*

	 * Setup the high resultion poll timer.

drivers/s390/crypto/ap_bus.h

+1 −1
Original line number Diff line number Diff line
@@ -241,7 +241,7 @@ void ap_flush_queue(struct ap_queue *aq); 


void *ap_airq_ptr(void);

void ap_wait(enum ap_wait wait);

void ap_request_timeout(unsigned long data);

void ap_request_timeout(struct timer_list *t);

void ap_bus_force_rescan(void);



void ap_queue_init_reply(struct ap_queue *aq, struct ap_message *ap_msg);

drivers/s390/crypto/ap_queue.c

+1 −1
Original line number Diff line number Diff line
@@ -634,7 +634,7 @@ struct ap_queue *ap_queue_create(ap_qid_t qid, int device_type) 
	INIT_LIST_HEAD(&aq->list);

	INIT_LIST_HEAD(&aq->pendingq);

	INIT_LIST_HEAD(&aq->requestq);

	setup_timer(&aq->timeout, ap_request_timeout, (unsigned long) aq);

	timer_setup(&aq->timeout, ap_request_timeout, 0);



	return aq;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE