diff options
Diffstat (limited to 'drivers/memstick/host')
-rw-r--r-- | drivers/memstick/host/jmb38x_ms.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/memstick/host/jmb38x_ms.c b/drivers/memstick/host/jmb38x_ms.c index 8770a5fac3b6..a054668eda16 100644 --- a/drivers/memstick/host/jmb38x_ms.c +++ b/drivers/memstick/host/jmb38x_ms.c | |||
@@ -361,15 +361,15 @@ static int jmb38x_ms_issue_cmd(struct memstick_host *msh) | |||
361 | unsigned int data_len, cmd, t_val; | 361 | unsigned int data_len, cmd, t_val; |
362 | 362 | ||
363 | if (!(STATUS_HAS_MEDIA & readl(host->addr + STATUS))) { | 363 | if (!(STATUS_HAS_MEDIA & readl(host->addr + STATUS))) { |
364 | dev_dbg(msh->cdev.dev, "no media status\n"); | 364 | dev_dbg(&msh->dev, "no media status\n"); |
365 | host->req->error = -ETIME; | 365 | host->req->error = -ETIME; |
366 | return host->req->error; | 366 | return host->req->error; |
367 | } | 367 | } |
368 | 368 | ||
369 | dev_dbg(msh->cdev.dev, "control %08x\n", | 369 | dev_dbg(&msh->dev, "control %08x\n", |
370 | readl(host->addr + HOST_CONTROL)); | 370 | readl(host->addr + HOST_CONTROL)); |
371 | dev_dbg(msh->cdev.dev, "status %08x\n", readl(host->addr + INT_STATUS)); | 371 | dev_dbg(&msh->dev, "status %08x\n", readl(host->addr + INT_STATUS)); |
372 | dev_dbg(msh->cdev.dev, "hstatus %08x\n", readl(host->addr + STATUS)); | 372 | dev_dbg(&msh->dev, "hstatus %08x\n", readl(host->addr + STATUS)); |
373 | 373 | ||
374 | host->cmd_flags = 0; | 374 | host->cmd_flags = 0; |
375 | host->block_pos = 0; | 375 | host->block_pos = 0; |
@@ -448,7 +448,7 @@ static int jmb38x_ms_issue_cmd(struct memstick_host *msh) | |||
448 | host->req->error = 0; | 448 | host->req->error = 0; |
449 | 449 | ||
450 | writel(cmd, host->addr + TPC); | 450 | writel(cmd, host->addr + TPC); |
451 | dev_dbg(msh->cdev.dev, "executing TPC %08x, len %x\n", cmd, data_len); | 451 | dev_dbg(&msh->dev, "executing TPC %08x, len %x\n", cmd, data_len); |
452 | 452 | ||
453 | return 0; | 453 | return 0; |
454 | } | 454 | } |
@@ -461,11 +461,11 @@ static void jmb38x_ms_complete_cmd(struct memstick_host *msh, int last) | |||
461 | 461 | ||
462 | del_timer(&host->timer); | 462 | del_timer(&host->timer); |
463 | 463 | ||
464 | dev_dbg(msh->cdev.dev, "c control %08x\n", | 464 | dev_dbg(&msh->dev, "c control %08x\n", |
465 | readl(host->addr + HOST_CONTROL)); | 465 | readl(host->addr + HOST_CONTROL)); |
466 | dev_dbg(msh->cdev.dev, "c status %08x\n", | 466 | dev_dbg(&msh->dev, "c status %08x\n", |
467 | readl(host->addr + INT_STATUS)); | 467 | readl(host->addr + INT_STATUS)); |
468 | dev_dbg(msh->cdev.dev, "c hstatus %08x\n", readl(host->addr + STATUS)); | 468 | dev_dbg(&msh->dev, "c hstatus %08x\n", readl(host->addr + STATUS)); |
469 | 469 | ||
470 | host->req->int_reg = readl(host->addr + STATUS) & 0xff; | 470 | host->req->int_reg = readl(host->addr + STATUS) & 0xff; |
471 | 471 | ||