diff options
| author | Al Viro <viro@ftp.linux.org.uk> | 2006-12-06 14:18:20 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-06 17:51:14 -0500 |
| commit | 4927b3f74c6a2fd92226dcf1542a598be9738808 (patch) | |
| tree | aee712f33f32a6dc992434773fd0de41e335078e /drivers/s390/crypto | |
| parent | f9e9dcb38f5106fa8cdac04a9e967d5487f1cd20 (diff) | |
[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')
| -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 6a54334ffe09..e4dc947e74e9 100644 --- a/drivers/s390/crypto/ap_bus.c +++ b/drivers/s390/crypto/ap_bus.c | |||
| @@ -37,7 +37,7 @@ | |||
| 37 | #include "ap_bus.h" | 37 | #include "ap_bus.h" |
| 38 | 38 | ||
| 39 | /* Some prototypes. */ | 39 | /* Some prototypes. */ |
| 40 | static void ap_scan_bus(void *); | 40 | static void ap_scan_bus(struct work_struct *); |
| 41 | static void ap_poll_all(unsigned long); | 41 | static void ap_poll_all(unsigned long); |
| 42 | static void ap_poll_timeout(unsigned long); | 42 | static void ap_poll_timeout(unsigned long); |
| 43 | static int ap_poll_thread_start(void); | 43 | static int ap_poll_thread_start(void); |
| @@ -71,7 +71,7 @@ static struct device *ap_root_device = NULL; | |||
| 71 | static struct workqueue_struct *ap_work_queue; | 71 | static struct workqueue_struct *ap_work_queue; |
| 72 | static struct timer_list ap_config_timer; | 72 | static struct timer_list ap_config_timer; |
| 73 | static int ap_config_time = AP_CONFIG_TIME; | 73 | static int ap_config_time = AP_CONFIG_TIME; |
| 74 | static DECLARE_WORK(ap_config_work, ap_scan_bus, NULL); | 74 | static DECLARE_WORK(ap_config_work, ap_scan_bus); |
| 75 | 75 | ||
| 76 | /** | 76 | /** |
| 77 | * Tasklet & timer for AP request polling. | 77 | * Tasklet & timer for AP request polling. |
| @@ -732,7 +732,7 @@ static void ap_device_release(struct device *dev) | |||
| 732 | kfree(ap_dev); | 732 | kfree(ap_dev); |
| 733 | } | 733 | } |
| 734 | 734 | ||
| 735 | static void ap_scan_bus(void *data) | 735 | static void ap_scan_bus(struct work_struct *unused) |
| 736 | { | 736 | { |
| 737 | struct ap_device *ap_dev; | 737 | struct ap_device *ap_dev; |
| 738 | struct device *dev; | 738 | struct device *dev; |
