Merge branch 'tracing/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-omap-h63xx.git] / drivers / s390 / block / xpram.c

diff --git a/drivers/s390/block/xpram.c b/drivers/s390/block/xpram.c
index a04d9120cef0111970cb4980235781a0f76a8a2c..dd9b986389a2bf4a2d38a71a64c01dfe25718ef3 100644 (file)
--- a/drivers/s390/block/xpram.c
+++ b/drivers/s390/block/xpram.c
@@ -100,15 +100,10 @@ static int xpram_page_in (unsigned long page_addr, unsigned int xpage_index)
                : "+d" (cc) : "a" (__pa(page_addr)), "d" (xpage_index) : "cc");
        if (cc == 3)
                return -ENXIO;
-       if (cc == 2) {
-               PRINT_ERR("expanded storage lost!\n");
+       if (cc == 2)
                return -ENXIO;
-       }
-       if (cc == 1) {
-               PRINT_ERR("page in failed for page index %u.\n",
-                         xpage_index);
+       if (cc == 1)
                return -EIO;
-       }
        return 0;
 }
 
@@ -135,15 +130,10 @@ static long xpram_page_out (unsigned long page_addr, unsigned int xpage_index)
                : "+d" (cc) : "a" (__pa(page_addr)), "d" (xpage_index) : "cc");
        if (cc == 3)
                return -ENXIO;
-       if (cc == 2) {
-               PRINT_ERR("expanded storage lost!\n");
+       if (cc == 2)
                return -ENXIO;
-       }
-       if (cc == 1) {
-               PRINT_ERR("page out failed for page index %u.\n",
-                         xpage_index);
+       if (cc == 1)
                return -EIO;
-       }
        return 0;
 }
 
@@ -191,7 +181,7 @@ static unsigned long __init xpram_highest_page_index(void)
 /*
  * Block device make request function.
  */
-static int xpram_make_request(request_queue_t *q, struct bio *bio)
+static int xpram_make_request(struct request_queue *q, struct bio *bio)
 {
        xpram_device_t *xdev = bio->bi_bdev->bd_disk->private_data;
        struct bio_vec *bvec;
@@ -230,12 +220,10 @@ static int xpram_make_request(request_queue_t *q, struct bio *bio)
                }
        }
        set_bit(BIO_UPTODATE, &bio->bi_flags);
-       bytes = bio->bi_size;
-       bio->bi_size = 0;
-       bio->bi_end_io(bio, bytes, 0);
+       bio_endio(bio, 0);
        return 0;
 fail:
-       bio_io_error(bio, bio->bi_size);
+       bio_io_error(bio);
        return 0;
 }