diff options
Diffstat (limited to 'drivers/block/paride')
| -rw-r--r-- | drivers/block/paride/pcd.c | 2 | ||||
| -rw-r--r-- | drivers/block/paride/pd.c | 4 | ||||
| -rw-r--r-- | drivers/block/paride/pf.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/drivers/block/paride/pcd.c b/drivers/block/paride/pcd.c index e76bdc074dbe..719cb1bc1640 100644 --- a/drivers/block/paride/pcd.c +++ b/drivers/block/paride/pcd.c | |||
| @@ -747,7 +747,7 @@ static void do_pcd_request(struct request_queue * q) | |||
| 747 | pcd_current = cd; | 747 | pcd_current = cd; |
| 748 | pcd_sector = blk_rq_pos(pcd_req); | 748 | pcd_sector = blk_rq_pos(pcd_req); |
| 749 | pcd_count = blk_rq_cur_sectors(pcd_req); | 749 | pcd_count = blk_rq_cur_sectors(pcd_req); |
| 750 | pcd_buf = pcd_req->buffer; | 750 | pcd_buf = bio_data(pcd_req->bio); |
| 751 | pcd_busy = 1; | 751 | pcd_busy = 1; |
| 752 | ps_set_intr(do_pcd_read, NULL, 0, nice); | 752 | ps_set_intr(do_pcd_read, NULL, 0, nice); |
| 753 | return; | 753 | return; |
diff --git a/drivers/block/paride/pd.c b/drivers/block/paride/pd.c index 19ad8f0c83ef..fea7e76a00de 100644 --- a/drivers/block/paride/pd.c +++ b/drivers/block/paride/pd.c | |||
| @@ -454,7 +454,7 @@ static enum action do_pd_io_start(void) | |||
| 454 | if (pd_block + pd_count > get_capacity(pd_req->rq_disk)) | 454 | if (pd_block + pd_count > get_capacity(pd_req->rq_disk)) |
| 455 | return Fail; | 455 | return Fail; |
| 456 | pd_run = blk_rq_sectors(pd_req); | 456 | pd_run = blk_rq_sectors(pd_req); |
| 457 | pd_buf = pd_req->buffer; | 457 | pd_buf = bio_data(pd_req->bio); |
| 458 | pd_retries = 0; | 458 | pd_retries = 0; |
| 459 | if (pd_cmd == READ) | 459 | if (pd_cmd == READ) |
| 460 | return do_pd_read_start(); | 460 | return do_pd_read_start(); |
| @@ -485,7 +485,7 @@ static int pd_next_buf(void) | |||
| 485 | spin_lock_irqsave(&pd_lock, saved_flags); | 485 | spin_lock_irqsave(&pd_lock, saved_flags); |
| 486 | __blk_end_request_cur(pd_req, 0); | 486 | __blk_end_request_cur(pd_req, 0); |
| 487 | pd_count = blk_rq_cur_sectors(pd_req); | 487 | pd_count = blk_rq_cur_sectors(pd_req); |
| 488 | pd_buf = pd_req->buffer; | 488 | pd_buf = bio_data(pd_req->bio); |
| 489 | spin_unlock_irqrestore(&pd_lock, saved_flags); | 489 | spin_unlock_irqrestore(&pd_lock, saved_flags); |
| 490 | return 0; | 490 | return 0; |
| 491 | } | 491 | } |
diff --git a/drivers/block/paride/pf.c b/drivers/block/paride/pf.c index f5c86d523ba0..9a15fd3c9349 100644 --- a/drivers/block/paride/pf.c +++ b/drivers/block/paride/pf.c | |||
| @@ -795,7 +795,7 @@ repeat: | |||
| 795 | } | 795 | } |
| 796 | 796 | ||
| 797 | pf_cmd = rq_data_dir(pf_req); | 797 | pf_cmd = rq_data_dir(pf_req); |
| 798 | pf_buf = pf_req->buffer; | 798 | pf_buf = bio_data(pf_req->bio); |
| 799 | pf_retries = 0; | 799 | pf_retries = 0; |
| 800 | 800 | ||
| 801 | pf_busy = 1; | 801 | pf_busy = 1; |
| @@ -827,7 +827,7 @@ static int pf_next_buf(void) | |||
| 827 | if (!pf_req) | 827 | if (!pf_req) |
| 828 | return 1; | 828 | return 1; |
| 829 | pf_count = blk_rq_cur_sectors(pf_req); | 829 | pf_count = blk_rq_cur_sectors(pf_req); |
| 830 | pf_buf = pf_req->buffer; | 830 | pf_buf = bio_data(pf_req->bio); |
| 831 | } | 831 | } |
| 832 | return 0; | 832 | return 0; |
| 833 | } | 833 | } |
