projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'slub-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/christoph/vm
[powerpc.git]
/
drivers
/
block
/
xsysace.c
diff --git
a/drivers/block/xsysace.c
b/drivers/block/xsysace.c
index
9e7652d
..
78ebfff
100644
(file)
--- a/
drivers/block/xsysace.c
+++ b/
drivers/block/xsysace.c
@@
-390,8
+390,8
@@
static inline void ace_dump_mem(void *base, int len)
static void ace_dump_regs(struct ace_device *ace)
{
dev_info(ace->dev, " ctrl: %.8x seccnt/cmd: %.4x ver:%.4x\n"
static void ace_dump_regs(struct ace_device *ace)
{
dev_info(ace->dev, " ctrl: %.8x seccnt/cmd: %.4x ver:%.4x\n"
- " status:%.8x mpu_lba:%.8x busmode:%4x\n"
- " error: %.8x cfg_lba:%.8x fatstat:%.4x\n",
+
KERN_INFO
" status:%.8x mpu_lba:%.8x busmode:%4x\n"
+
KERN_INFO
" error: %.8x cfg_lba:%.8x fatstat:%.4x\n",
ace_in32(ace, ACE_CTRL),
ace_in(ace, ACE_SECCNTCMD),
ace_in(ace, ACE_VERSION),
ace_in32(ace, ACE_CTRL),
ace_in(ace, ACE_SECCNTCMD),
ace_in(ace, ACE_VERSION),
@@
-483,7
+483,6
@@
static void ace_fsm_dostate(struct ace_device *ace)
u32 status;
u16 val;
int count;
u32 status;
u16 val;
int count;
- int i;
#if defined(DEBUG)
dev_dbg(ace->dev, "fsm_state=%i, id_req_count=%i\n",
#if defined(DEBUG)
dev_dbg(ace->dev, "fsm_state=%i, id_req_count=%i\n",
@@
-688,7
+687,6
@@
static void ace_fsm_dostate(struct ace_device *ace)
}
/* Transfer the next buffer */
}
/* Transfer the next buffer */
- i = 16;
if (ace->fsm_task == ACE_TASK_WRITE)
ace->reg_ops->dataout(ace);
else
if (ace->fsm_task == ACE_TASK_WRITE)
ace->reg_ops->dataout(ace);
else
@@
-702,8
+700,8
@@
static void ace_fsm_dostate(struct ace_device *ace)
}
/* bio finished; is there another one? */
}
/* bio finished; is there another one? */
- i
= ace->req->current_nr_sectors;
-
if (end_that_request_first(ace->req, 1, i
)) {
+ i
f (__blk_end_request(ace->req, 0,
+
blk_rq_cur_bytes(ace->req)
)) {
/* dev_dbg(ace->dev, "next block; h=%li c=%i\n",
* ace->req->hard_nr_sectors,
* ace->req->current_nr_sectors);
/* dev_dbg(ace->dev, "next block; h=%li c=%i\n",
* ace->req->hard_nr_sectors,
* ace->req->current_nr_sectors);
@@
-718,9
+716,6
@@
static void ace_fsm_dostate(struct ace_device *ace)
break;
case ACE_FSM_STATE_REQ_COMPLETE:
break;
case ACE_FSM_STATE_REQ_COMPLETE:
- /* Complete the block request */
- blkdev_dequeue_request(ace->req);
- end_that_request_last(ace->req, 1);
ace->req = NULL;
/* Finished request; go to idle state */
ace->req = NULL;
/* Finished request; go to idle state */