Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...

[pandora-kernel.git] / drivers / memstick / host / jmb38x_ms.c

diff --git a/drivers/memstick/host/jmb38x_ms.c b/drivers/memstick/host/jmb38x_ms.c
index 8770a5f..4e3bfbc 100644 (file)
--- a/drivers/memstick/host/jmb38x_ms.c
+++ b/drivers/memstick/host/jmb38x_ms.c
@@ -51,7 +51,7 @@ struct jmb38x_ms_host {
        void __iomem            *addr;
        spinlock_t              lock;
        int                     id;
-       char                    host_id[DEVICE_ID_SIZE];
+       char                    host_id[32];
        int                     irq;
        unsigned int            block_pos;
        unsigned long           timeout_jiffies;
@@ -361,15 +361,15 @@ static int jmb38x_ms_issue_cmd(struct memstick_host *msh)
        unsigned int data_len, cmd, t_val;
 
        if (!(STATUS_HAS_MEDIA & readl(host->addr + STATUS))) {
-               dev_dbg(msh->cdev.dev, "no media status\n");
+               dev_dbg(&msh->dev, "no media status\n");
                host->req->error = -ETIME;
                return host->req->error;
        }
 
-       dev_dbg(msh->cdev.dev, "control %08x\n",
+       dev_dbg(&msh->dev, "control %08x\n",
                readl(host->addr + HOST_CONTROL));
-       dev_dbg(msh->cdev.dev, "status %08x\n", readl(host->addr + INT_STATUS));
-       dev_dbg(msh->cdev.dev, "hstatus %08x\n", readl(host->addr + STATUS));
+       dev_dbg(&msh->dev, "status %08x\n", readl(host->addr + INT_STATUS));
+       dev_dbg(&msh->dev, "hstatus %08x\n", readl(host->addr + STATUS));
 
        host->cmd_flags = 0;
        host->block_pos = 0;
@@ -448,7 +448,7 @@ static int jmb38x_ms_issue_cmd(struct memstick_host *msh)
        host->req->error = 0;
 
        writel(cmd, host->addr + TPC);
-       dev_dbg(msh->cdev.dev, "executing TPC %08x, len %x\n", cmd, data_len);
+       dev_dbg(&msh->dev, "executing TPC %08x, len %x\n", cmd, data_len);
 
        return 0;
 }
@@ -461,11 +461,11 @@ static void jmb38x_ms_complete_cmd(struct memstick_host *msh, int last)
 
        del_timer(&host->timer);
 
-       dev_dbg(msh->cdev.dev, "c control %08x\n",
+       dev_dbg(&msh->dev, "c control %08x\n",
                readl(host->addr + HOST_CONTROL));
-       dev_dbg(msh->cdev.dev, "c status %08x\n",
+       dev_dbg(&msh->dev, "c status %08x\n",
                readl(host->addr + INT_STATUS));
-       dev_dbg(msh->cdev.dev, "c hstatus %08x\n", readl(host->addr + STATUS));
+       dev_dbg(&msh->dev, "c hstatus %08x\n", readl(host->addr + STATUS));
 
        host->req->int_reg = readl(host->addr + STATUS) & 0xff;
 
@@ -781,7 +781,7 @@ static struct memstick_host *jmb38x_ms_alloc_host(struct jmb38x_ms *jm, int cnt)
 
        spin_lock_init(&host->lock);
        host->id = cnt;
-       snprintf(host->host_id, DEVICE_ID_SIZE, DRIVER_NAME ":slot%d",
+       snprintf(host->host_id, sizeof(host->host_id), DRIVER_NAME ":slot%d",
                 host->id);
        host->irq = jm->pdev->irq;
        host->timeout_jiffies = msecs_to_jiffies(1000);