[S390] more workqueue fixes.

Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

1 files changed, 5 insertions, 3 deletions

diff --git a/drivers/s390/cio/qdio.c b/drivers/s390/cio/qdio.c
index 8d5fa1b4d11f..d066dbf2c65d 100644
--- a/drivers/s390/cio/qdio.c
+++ b/drivers/s390/cio/qdio.c
@@ -2045,11 +2045,13 @@ omit_handler_call:
 }
 
 static void
-qdio_call_shutdown(void *data)
+qdio_call_shutdown(struct work_struct *work)
 {
+        struct ccw_device_private *priv;
         struct ccw_device *cdev;
 
-        cdev = (struct ccw_device *)data;
+        priv = container_of(work, struct ccw_device_private, kick_work);
+        cdev = priv->cdev;
         qdio_shutdown(cdev, QDIO_FLAG_CLEANUP_USING_CLEAR);
         put_device(&cdev->dev);
 }
@@ -2091,7 +2093,7 @@ qdio_timeout_handler(struct ccw_device *cdev)
                 if (get_device(&cdev->dev)) {
                         /* Can't call shutdown from interrupt context. */
                         PREPARE_WORK(&cdev->private->kick_work,
-                                     qdio_call_shutdown, (void *)cdev);
+                                     qdio_call_shutdown);
                         queue_work(ccw_device_work, &cdev->private->kick_work);
                 }
                 break;