diff options
| author | Al Viro <viro@ftp.linux.org.uk> | 2006-12-06 19:18:20 +0000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-06 14:51:14 -0800 |
| commit | 4927b3f74c6a2fd92226dcf1542a598be9738808 (patch) | |
| tree | aee712f33f32a6dc992434773fd0de41e335078e /drivers/s390/crypto/ap_bus.c | |
| parent | f9e9dcb38f5106fa8cdac04a9e967d5487f1cd20 (diff) | |
| download | kernel_samsung_smdk4412-4927b3f74c6a2fd92226dcf1542a598be9738808.zip kernel_samsung_smdk4412-4927b3f74c6a2fd92226dcf1542a598be9738808.tar.gz kernel_samsung_smdk4412-4927b3f74c6a2fd92226dcf1542a598be9738808.tar.bz2 | |
[PATCH] More work_struct induced breakage (s390)
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/s390/crypto/ap_bus.c')
| -rw-r--r-- | drivers/s390/crypto/ap_bus.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/s390/crypto/ap_bus.c b/drivers/s390/crypto/ap_bus.c index 6a54334..e4dc947 100644 --- a/drivers/s390/crypto/ap_bus.c +++ b/drivers/s390/crypto/ap_bus.c @@ -37,7 +37,7 @@ #include "ap_bus.h" /* Some prototypes. */ -static void ap_scan_bus(void *); +static void ap_scan_bus(struct work_struct *); static void ap_poll_all(unsigned long); static void ap_poll_timeout(unsigned long); static int ap_poll_thread_start(void); @@ -71,7 +71,7 @@ static struct device *ap_root_device = NULL; static struct workqueue_struct *ap_work_queue; static struct timer_list ap_config_timer; static int ap_config_time = AP_CONFIG_TIME; -static DECLARE_WORK(ap_config_work, ap_scan_bus, NULL); +static DECLARE_WORK(ap_config_work, ap_scan_bus); /** * Tasklet & timer for AP request polling. @@ -732,7 +732,7 @@ static void ap_device_release(struct device *dev) kfree(ap_dev); } -static void ap_scan_bus(void *data) +static void ap_scan_bus(struct work_struct *unused) { struct ap_device *ap_dev; struct device *dev; |