aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/block/xsysace.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/block/xsysace.c')
-rw-r--r--drivers/block/xsysace.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/block/xsysace.c b/drivers/block/xsysace.c
index b1e1d7e5ab1e..5722931d14c5 100644
--- a/drivers/block/xsysace.c
+++ b/drivers/block/xsysace.c
@@ -645,8 +645,8 @@ static void ace_fsm_dostate(struct ace_device *ace)
645 645
646 /* Okay, it's a data request, set it up for transfer */ 646 /* Okay, it's a data request, set it up for transfer */
647 dev_dbg(ace->dev, 647 dev_dbg(ace->dev,
648 "request: sec=%llx hcnt=%lx, ccnt=%x, dir=%i\n", 648 "request: sec=%llx hcnt=%x, ccnt=%x, dir=%i\n",
649 (unsigned long long) req->sector, req->hard_nr_sectors, 649 (unsigned long long) req->sector, blk_rq_sectors(req),
650 req->current_nr_sectors, rq_data_dir(req)); 650 req->current_nr_sectors, rq_data_dir(req));
651 651
652 ace->req = req; 652 ace->req = req;
@@ -654,7 +654,7 @@ static void ace_fsm_dostate(struct ace_device *ace)
654 ace->data_count = req->current_nr_sectors * ACE_BUF_PER_SECTOR; 654 ace->data_count = req->current_nr_sectors * ACE_BUF_PER_SECTOR;
655 ace_out32(ace, ACE_MPULBA, req->sector & 0x0FFFFFFF); 655 ace_out32(ace, ACE_MPULBA, req->sector & 0x0FFFFFFF);
656 656
657 count = req->hard_nr_sectors; 657 count = blk_rq_sectors(req);
658 if (rq_data_dir(req)) { 658 if (rq_data_dir(req)) {
659 /* Kick off write request */ 659 /* Kick off write request */
660 dev_dbg(ace->dev, "write data\n"); 660 dev_dbg(ace->dev, "write data\n");
@@ -719,8 +719,8 @@ static void ace_fsm_dostate(struct ace_device *ace)
719 /* bio finished; is there another one? */ 719 /* bio finished; is there another one? */
720 if (__blk_end_request(ace->req, 0, 720 if (__blk_end_request(ace->req, 0,
721 blk_rq_cur_bytes(ace->req))) { 721 blk_rq_cur_bytes(ace->req))) {
722 /* dev_dbg(ace->dev, "next block; h=%li c=%i\n", 722 /* dev_dbg(ace->dev, "next block; h=%u c=%u\n",
723 * ace->req->hard_nr_sectors, 723 * blk_rq_sectors(ace->req),
724 * ace->req->current_nr_sectors); 724 * ace->req->current_nr_sectors);
725 */ 725 */
726 ace->data_ptr = ace->req->buffer; 726 ace->data_ptr = ace->req->buffer;