7 files changed, 40 insertions, 48 deletions

diff --git a/drivers/s390/cio/chsc.c b/drivers/s390/cio/chsc.c
index 597c0c76a2ad..44a2ea40806e 100644
--- a/drivers/s390/cio/chsc.c
+++ b/drivers/s390/cio/chsc.c
@@ -132,7 +132,7 @@ static void terminate_internal_io(struct subchannel *sch)
         device_set_intretry(sch);
         /* Call handler. */
         if (sch->driver && sch->driver->termination)
-                sch->driver->termination(&sch->dev);
+                sch->driver->termination(sch);
 }
 
 static int
@@ -172,12 +172,12 @@ s390_subchannel_remove_chpid(struct device *dev, void *data)
                         terminate_internal_io(sch);
                         /* Re-start path verification. */
                         if (sch->driver && sch->driver->verify)
-                                sch->driver->verify(&sch->dev);
+                                sch->driver->verify(sch);
                 }
         } else {
                 /* trigger path verification. */
                 if (sch->driver && sch->driver->verify)
-                        sch->driver->verify(&sch->dev);
+                        sch->driver->verify(sch);
                 else if (sch->lpm == mask)
                         goto out_unreg;
         }
@@ -279,7 +279,7 @@ __s390_process_res_acc(struct subchannel_id schid, void *data)
         if (!old_lpm && sch->lpm)
                 device_trigger_reprobe(sch);
         else if (sch->driver && sch->driver->verify)
-                sch->driver->verify(&sch->dev);
+                sch->driver->verify(sch);
 out:
         spin_unlock_irq(sch->lock);
         put_device(&sch->dev);
@@ -549,7 +549,7 @@ __chp_add(struct subchannel_id schid, void *data)
                     | mask) & sch->opm;
 
         if (sch->driver && sch->driver->verify)
-                sch->driver->verify(&sch->dev);
+                sch->driver->verify(sch);
 
         spin_unlock_irq(sch->lock);
         put_device(&sch->dev);
@@ -589,7 +589,7 @@ static void __s390_subchannel_vary_chpid(struct subchannel *sch,
                         if (!old_lpm)
                                 device_trigger_reprobe(sch);
                         else if (sch->driver && sch->driver->verify)
-                                sch->driver->verify(&sch->dev);
+                                sch->driver->verify(sch);
                         break;
                 }
                 sch->opm &= ~mask;
@@ -603,13 +603,13 @@ static void __s390_subchannel_vary_chpid(struct subchannel *sch,
                                 terminate_internal_io(sch);
                                 /* Re-start path verification. */
                                 if (sch->driver && sch->driver->verify)
-                                        sch->driver->verify(&sch->dev);
+                                        sch->driver->verify(sch);
                         }
                 } else if (!sch->lpm) {
                         if (device_trigger_verify(sch) != 0)
                                 css_schedule_eval(sch->schid);
                 } else if (sch->driver && sch->driver->verify)
-                        sch->driver->verify(&sch->dev);
+                        sch->driver->verify(sch);
                 break;
         }
         spin_unlock_irqrestore(sch->lock, flags);
diff --git a/drivers/s390/cio/cio.c b/drivers/s390/cio/cio.c
index 46905345159e..469b00774c5e 100644
--- a/drivers/s390/cio/cio.c
+++ b/drivers/s390/cio/cio.c
@@ -147,7 +147,7 @@ cio_tpi(void)
         spin_lock(sch->lock);
         memcpy (&sch->schib.scsw, &irb->scsw, sizeof (struct scsw));
         if (sch->driver && sch->driver->irq)
-                sch->driver->irq(&sch->dev);
+                sch->driver->irq(sch);
         spin_unlock(sch->lock);
         irq_exit ();
         _local_bh_enable();
@@ -680,7 +680,7 @@ do_IRQ (struct pt_regs *regs)
                                 sizeof (irb->scsw));
                         /* Call interrupt handler if there is one. */
                         if (sch->driver && sch->driver->irq)
-                                sch->driver->irq(&sch->dev);
+                                sch->driver->irq(sch);
                 }
                 if (sch)
                         spin_unlock(sch->lock);
diff --git a/drivers/s390/cio/css.c b/drivers/s390/cio/css.c
index bc2f8fa576a3..614cc694184e 100644
--- a/drivers/s390/cio/css.c
+++ b/drivers/s390/cio/css.c
@@ -293,7 +293,7 @@ static int css_evaluate_known_subchannel(struct subchannel *sch, int slow)
                 action = UNREGISTER;
                 if (sch->driver && sch->driver->notify) {
                         spin_unlock_irqrestore(sch->lock, flags);
-                        ret = sch->driver->notify(&sch->dev, event);
+                        ret = sch->driver->notify(sch, event);
                         spin_lock_irqsave(sch->lock, flags);
                         if (ret)
                                 action = NONE;
diff --git a/drivers/s390/cio/css.h b/drivers/s390/cio/css.h
index 1d8306cc74c4..32acd24a407c 100644
--- a/drivers/s390/cio/css.h
+++ b/drivers/s390/cio/css.h
@@ -125,10 +125,10 @@ struct subchannel;
 struct css_driver {
         unsigned int subchannel_type;
         struct device_driver drv;
-        void (*irq)(struct device *);
-        int (*notify)(struct device *, int);
-        void (*verify)(struct device *);
-        void (*termination)(struct device *);
+        void (*irq)(struct subchannel *);
+        int (*notify)(struct subchannel *, int);
+        void (*verify)(struct subchannel *);
+        void (*termination)(struct subchannel *);
         int (*probe)(struct subchannel *);
         int (*remove)(struct subchannel *);
         void (*shutdown)(struct subchannel *);
diff --git a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c
index 74f6b539974a..000c64129ed8 100644
--- a/drivers/s390/cio/device.c
+++ b/drivers/s390/cio/device.c
@@ -115,11 +115,12 @@ static int ccw_uevent(struct device *dev, struct kobj_uevent_env *env)
 
 struct bus_type ccw_bus_type;
 
-static int io_subchannel_probe (struct subchannel *);
-static int io_subchannel_remove (struct subchannel *);
-static int io_subchannel_notify(struct device *, int);
-static void io_subchannel_verify(struct device *);
-static void io_subchannel_ioterm(struct device *);
+static void io_subchannel_irq(struct subchannel *);
+static int io_subchannel_probe(struct subchannel *);
+static int io_subchannel_remove(struct subchannel *);
+static int io_subchannel_notify(struct subchannel *, int);
+static void io_subchannel_verify(struct subchannel *);
+static void io_subchannel_ioterm(struct subchannel *);
 static void io_subchannel_shutdown(struct subchannel *);
 
 static struct css_driver io_subchannel_driver = {
@@ -1096,6 +1097,18 @@ out:
         put_device(&cdev->dev);
 }
 
+static void io_subchannel_irq(struct subchannel *sch)
+{
+        struct ccw_device *cdev;
+
+        cdev = sch->dev.driver_data;
+
+        CIO_TRACE_EVENT(3, "IRQ");
+        CIO_TRACE_EVENT(3, sch->dev.bus_id);
+        if (cdev)
+                dev_fsm_event(cdev, DEV_EVENT_INTERRUPT);
+}
+
 static int
 io_subchannel_probe (struct subchannel *sch)
 {
@@ -1183,12 +1196,11 @@ io_subchannel_remove (struct subchannel *sch)
         return 0;
 }
 
-static int
-io_subchannel_notify(struct device *dev, int event)
+static int io_subchannel_notify(struct subchannel *sch, int event)
 {
         struct ccw_device *cdev;
 
-        cdev = dev->driver_data;
+        cdev = sch->dev.driver_data;
         if (!cdev)
                 return 0;
         if (!cdev->drv)
@@ -1198,22 +1210,20 @@ io_subchannel_notify(struct device *dev, int event)
         return cdev->drv->notify ? cdev->drv->notify(cdev, event) : 0;
 }
 
-static void
-io_subchannel_verify(struct device *dev)
+static void io_subchannel_verify(struct subchannel *sch)
 {
         struct ccw_device *cdev;
 
-        cdev = dev->driver_data;
+        cdev = sch->dev.driver_data;
         if (cdev)
                 dev_fsm_event(cdev, DEV_EVENT_VERIFY);
 }
 
-static void
-io_subchannel_ioterm(struct device *dev)
+static void io_subchannel_ioterm(struct subchannel *sch)
 {
         struct ccw_device *cdev;
 
-        cdev = dev->driver_data;
+        cdev = sch->dev.driver_data;
         if (!cdev)
                 return;
         /* Internal I/O will be retried by the interrupt handler. */
diff --git a/drivers/s390/cio/device.h b/drivers/s390/cio/device.h
index 0d4089600439..6183731fb9a2 100644
--- a/drivers/s390/cio/device.h
+++ b/drivers/s390/cio/device.h
@@ -74,7 +74,6 @@ extern struct workqueue_struct *ccw_device_notify_work;
 extern wait_queue_head_t ccw_device_init_wq;
 extern atomic_t ccw_device_init_count;
 
-void io_subchannel_irq (struct device *pdev);
 void io_subchannel_recog_done(struct ccw_device *cdev);
 
 int ccw_device_cancel_halt_clear(struct ccw_device *);
diff --git a/drivers/s390/cio/device_fsm.c b/drivers/s390/cio/device_fsm.c
index 31c0f7885161..baca6c6c9855 100644
--- a/drivers/s390/cio/device_fsm.c
+++ b/drivers/s390/cio/device_fsm.c
@@ -399,7 +399,7 @@ ccw_device_oper_notify(struct work_struct *work)
         sch = to_subchannel(cdev->dev.parent);
         if (sch->driver && sch->driver->notify) {
                 spin_unlock_irqrestore(cdev->ccwlock, flags);
-                ret = sch->driver->notify(&sch->dev, CIO_OPER);
+                ret = sch->driver->notify(sch, CIO_OPER);
                 spin_lock_irqsave(cdev->ccwlock, flags);
         } else
                 ret = 0;
@@ -1273,21 +1273,4 @@ fsm_func_t *dev_jumptable[NR_DEV_STATES][NR_DEV_EVENTS] = {
         },
 };
 
-/*
- * io_subchannel_irq is called for "real" interrupts or for status
- * pending conditions on msch.
- */
-void
-io_subchannel_irq (struct device *pdev)
-{
-        struct ccw_device *cdev;
-
-        cdev = to_subchannel(pdev)->dev.driver_data;
-
-        CIO_TRACE_EVENT (3, "IRQ");
-        CIO_TRACE_EVENT (3, pdev->bus_id);
-        if (cdev)
-                dev_fsm_event(cdev, DEV_EVENT_INTERRUPT);
-}
-
 EXPORT_SYMBOL_GPL(ccw_device_set_timeout);