Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild

[linux-2.6-omap-h63xx.git] / drivers / s390 / cio / device_ops.c

diff --git a/drivers/s390/cio/device_ops.c b/drivers/s390/cio/device_ops.c
index 11e260e0b9c92d475d9683ced2ee910314b749ff..143b6c25a4e6b228c408636b3a67e1cfa3d5467a 100644 (file)
--- a/drivers/s390/cio/device_ops.c
+++ b/drivers/s390/cio/device_ops.c
@@ -1,7 +1,7 @@
 /*
  *  drivers/s390/cio/device_ops.c
  *
- *   $Revision: 1.55 $
+ *   $Revision: 1.58 $
  *
  *    Copyright (C) 2002 IBM Deutschland Entwicklung GmbH,
  *                      IBM Corporation
@@ -19,14 +19,12 @@
 
 #include <asm/ccwdev.h>
 #include <asm/idals.h>
-#include <asm/qdio.h>
 
 #include "cio.h"
 #include "cio_debug.h"
 #include "css.h"
 #include "chsc.h"
 #include "device.h"
-#include "qdio.h"
 
 int
 ccw_device_set_options(struct ccw_device *cdev, unsigned long flags)
@@ -128,7 +126,7 @@ ccw_device_start(struct ccw_device *cdev, struct ccw1 *cpa,
                 unsigned long intparm, __u8 lpm, unsigned long flags)
 {
        return ccw_device_start_key(cdev, cpa, intparm, lpm,
-                                   default_storage_key, flags);
+                                   PAGE_DEFAULT_KEY, flags);
 }
 
 int
@@ -137,7 +135,7 @@ ccw_device_start_timeout(struct ccw_device *cdev, struct ccw1 *cpa,
                         int expires)
 {
        return ccw_device_start_timeout_key(cdev, cpa, intparm, lpm,
-                                           default_storage_key, flags,
+                                           PAGE_DEFAULT_KEY, flags,
                                            expires);
 }
 
@@ -552,10 +550,8 @@ ccw_device_stlck(struct ccw_device *cdev)
        /* Clear irb. */
        memset(&cdev->private->irb, 0, sizeof(struct irb));
 out_unlock:
-       if (buf)
-               kfree(buf);
-       if (buf2)
-               kfree(buf2);
+       kfree(buf);
+       kfree(buf2);
        spin_unlock_irqrestore(&sch->lock, flags);
        return ret;
 }
@@ -574,7 +570,7 @@ ccw_device_get_chp_desc(struct ccw_device *cdev, int chp_no)
 int
 _ccw_device_get_subchannel_number(struct ccw_device *cdev)
 {
-       return cdev->private->irq;
+       return cdev->private->sch_no;
 }
 
 int