diff options
Diffstat (limited to 'arch/powerpc/sysdev/axonram.c')
| -rw-r--r-- | arch/powerpc/sysdev/axonram.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/arch/powerpc/sysdev/axonram.c b/arch/powerpc/sysdev/axonram.c index 265f0f09395a..ba4271919062 100644 --- a/arch/powerpc/sysdev/axonram.c +++ b/arch/powerpc/sysdev/axonram.c | |||
| @@ -104,7 +104,7 @@ axon_ram_irq_handler(int irq, void *dev) | |||
| 104 | * axon_ram_make_request - make_request() method for block device | 104 | * axon_ram_make_request - make_request() method for block device |
| 105 | * @queue, @bio: see blk_queue_make_request() | 105 | * @queue, @bio: see blk_queue_make_request() |
| 106 | */ | 106 | */ |
| 107 | static int | 107 | static void |
| 108 | axon_ram_make_request(struct request_queue *queue, struct bio *bio) | 108 | axon_ram_make_request(struct request_queue *queue, struct bio *bio) |
| 109 | { | 109 | { |
| 110 | struct axon_ram_bank *bank = bio->bi_bdev->bd_disk->private_data; | 110 | struct axon_ram_bank *bank = bio->bi_bdev->bd_disk->private_data; |
| @@ -113,7 +113,6 @@ axon_ram_make_request(struct request_queue *queue, struct bio *bio) | |||
| 113 | struct bio_vec *vec; | 113 | struct bio_vec *vec; |
| 114 | unsigned int transfered; | 114 | unsigned int transfered; |
| 115 | unsigned short idx; | 115 | unsigned short idx; |
| 116 | int rc = 0; | ||
| 117 | 116 | ||
| 118 | phys_mem = bank->io_addr + (bio->bi_sector << AXON_RAM_SECTOR_SHIFT); | 117 | phys_mem = bank->io_addr + (bio->bi_sector << AXON_RAM_SECTOR_SHIFT); |
| 119 | phys_end = bank->io_addr + bank->size; | 118 | phys_end = bank->io_addr + bank->size; |
| @@ -121,8 +120,7 @@ axon_ram_make_request(struct request_queue *queue, struct bio *bio) | |||
| 121 | bio_for_each_segment(vec, bio, idx) { | 120 | bio_for_each_segment(vec, bio, idx) { |
| 122 | if (unlikely(phys_mem + vec->bv_len > phys_end)) { | 121 | if (unlikely(phys_mem + vec->bv_len > phys_end)) { |
| 123 | bio_io_error(bio); | 122 | bio_io_error(bio); |
| 124 | rc = -ERANGE; | 123 | return; |
| 125 | break; | ||
| 126 | } | 124 | } |
| 127 | 125 | ||
| 128 | user_mem = page_address(vec->bv_page) + vec->bv_offset; | 126 | user_mem = page_address(vec->bv_page) + vec->bv_offset; |
| @@ -135,8 +133,6 @@ axon_ram_make_request(struct request_queue *queue, struct bio *bio) | |||
| 135 | transfered += vec->bv_len; | 133 | transfered += vec->bv_len; |
| 136 | } | 134 | } |
| 137 | bio_endio(bio, 0); | 135 | bio_endio(bio, 0); |
| 138 | |||
| 139 | return rc; | ||
| 140 | } | 136 | } |
| 141 | 137 | ||
| 142 | /** | 138 | /** |
