[S390] more workqueue fixes.

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

1 files changed, 11 insertions, 12 deletions

diff --git a/drivers/s390/char/tape_34xx.c b/drivers/s390/char/tape_34xx.c
index 7b95dab913d0..e765875e8db2 100644
--- a/drivers/s390/char/tape_34xx.c
+++ b/drivers/s390/char/tape_34xx.c
@@ -95,6 +95,12 @@ tape_34xx_medium_sense(struct tape_device *device)
         return rc;
 }
 
+struct tape_34xx_work {
+        struct tape_device      *device;
+        enum tape_op             op;
+        struct work_struct       work;
+};
+
 /*
  * These functions are currently used only to schedule a medium_sense for
  * later execution. This is because we get an interrupt whenever a medium
@@ -103,13 +109,10 @@ tape_34xx_medium_sense(struct tape_device *device)
  * interrupt handler.
  */
 static void
-tape_34xx_work_handler(void *data)
+tape_34xx_work_handler(struct work_struct *work)
 {
-        struct {
-                struct tape_device      *device;
-                enum tape_op             op;
-                struct work_struct       work;
-        } *p = data;
+        struct tape_34xx_work *p =
+                container_of(work, struct tape_34xx_work, work);
 
         switch(p->op) {
                 case TO_MSEN:
@@ -126,17 +129,13 @@ tape_34xx_work_handler(void *data)
 static int
 tape_34xx_schedule_work(struct tape_device *device, enum tape_op op)
 {
-        struct {
-                struct tape_device      *device;
-                enum tape_op             op;
-                struct work_struct       work;
-        } *p;
+        struct tape_34xx_work *p;
 
         if ((p = kmalloc(sizeof(*p), GFP_ATOMIC)) == NULL)
                 return -ENOMEM;
 
         memset(p, 0, sizeof(*p));
-        INIT_WORK(&p->work, tape_34xx_work_handler, p);
+        INIT_WORK(&p->work, tape_34xx_work_handler);
 
         p->device = tape_get_device_reference(device);
         p->op     = op;