leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

s390/ap_bus: Convert timers to use timer_setup()

Browse Source 
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: Kees Cook <keescook@chromium.org>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
This commit is contained in:
Kees Cook 2017-10-25 03:27:37 -07:00 committed by Heiko Carstens
parent c9602ee7d1
commit cefbeb5df5
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/s390/crypto/ap_bus.c
View File

@ -374,13 +374,13 @@ void ap_wait(enum ap_wait wait)
/** /**
* ap_request_timeout(): Handling of request timeouts * ap_request_timeout(): Handling of request timeouts
* @data: Holds the AP device. * @t: timer making this callback
* *
* Handles request timeouts. * 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) if (ap_suspend_flag)
return; return;
@ -1203,7 +1203,7 @@ out:
mod_timer(&ap_config_timer, jiffies + ap_config_time * HZ); 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) if (ap_suspend_flag)
return; return;
@ -1306,7 +1306,7 @@ int __init ap_module_init(void)
goto out_bus; goto out_bus;
/* Setup the AP bus rescan timer. */ /* 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. * Setup the high resultion poll timer.

2
drivers/s390/crypto/ap_bus.h
View File

@ -241,7 +241,7 @@ void ap_flush_queue(struct ap_queue *aq);
void *ap_airq_ptr(void); void *ap_airq_ptr(void);
void ap_wait(enum ap_wait wait); 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_bus_force_rescan(void);
void ap_queue_init_reply(struct ap_queue *aq, struct ap_message *ap_msg); void ap_queue_init_reply(struct ap_queue *aq, struct ap_message *ap_msg);

2
drivers/s390/crypto/ap_queue.c
View File

@ -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->list);
INIT_LIST_HEAD(&aq->pendingq); INIT_LIST_HEAD(&aq->pendingq);
INIT_LIST_HEAD(&aq->requestq); 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; return aq;
} }