diff options
| author | Linus Torvalds <torvalds@athlon.transmeta.com> | 2002-02-04 23:58:14 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@athlon.transmeta.com> | 2002-02-04 23:58:14 -0800 |
| commit | 40b1df3aaf1d7d7258b501baa805fa2c5bb2692b (patch) | |
| tree | 403452f5517f33e9a0e2a2220393da433c42a694 /drivers/message | |
| parent | 4d6c7b36fcb5b4d3a727a9d84353422bacd173a3 (diff) | |
v2.5.0.3 -> v2.5.0.4
- Jens Axboe: fix up bio highmem breakage, more cleanups
- Greg KH: USB update
Diffstat (limited to 'drivers/message')
| -rw-r--r-- | drivers/message/i2o/i2o_block.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/drivers/message/i2o/i2o_block.c b/drivers/message/i2o/i2o_block.c index 0c079711e36a..1d112a2001f4 100644 --- a/drivers/message/i2o/i2o_block.c +++ b/drivers/message/i2o/i2o_block.c @@ -287,8 +287,8 @@ static int i2ob_send(u32 m, struct i2ob_device *dev, struct i2ob_request *ireq, while(bio) { if (bio_to_phys(bio) == last) { - size += bio_size(bio); - last += bio_size(bio); + size += bio->bi_size; + last += bio->bi_size; if(bio->bi_next) __raw_writel(0x14000000|(size), mptr-8); else @@ -297,16 +297,16 @@ static int i2ob_send(u32 m, struct i2ob_device *dev, struct i2ob_request *ireq, else { if(bio->bi_next) - __raw_writel(0x10000000|bio_size(bio), mptr); + __raw_writel(0x10000000|bio->bi_size, mptr); else - __raw_writel(0xD0000000|bio_size(bio), mptr); + __raw_writel(0xD0000000|bio->bi_size, mptr); __raw_writel(bio_to_phys(bio), mptr+4); mptr += 8; - size = bio_size(bio); - last = bio_to_phys(bio) + bio_size(bio); + size = bio->bi_size; + last = bio_to_phys(bio) + bio->bi_size; } - count -= bio_size(bio); + count -= bio->bi_size; bio = bio->bi_next; } /* @@ -326,8 +326,8 @@ static int i2ob_send(u32 m, struct i2ob_device *dev, struct i2ob_request *ireq, while(bio) { if (bio_to_phys(bio) == last) { - size += bio_size(bio); - last += bio_size(bio); + size += bio->bi_size; + last += bio->bi_size; if(bio->bi_next) __raw_writel(0x14000000|(size), mptr-8); else @@ -336,16 +336,16 @@ static int i2ob_send(u32 m, struct i2ob_device *dev, struct i2ob_request *ireq, else { if(bio->bi_next) - __raw_writel(0x14000000|bio_size(bio), mptr); + __raw_writel(0x14000000|bio->bi_size, mptr); else - __raw_writel(0xD4000000|bio_size(bio), mptr); + __raw_writel(0xD4000000|bio->bi_size, mptr); __raw_writel(bio_to_phys(bio), mptr+4); mptr += 8; - size = bio_size(bio); - last = bio_to_phys(bio) + bio_size(bio); + size = bio->bi_size; + last = bio_to_phys(bio) + bio->bi_size; } - count -= bio_size(bio); + count -= bio->bi_size; bio = bio->bi_next; } |