From: Andrew Morton Update gregkh-driver-net-convert-the-phy_device-file-to-use-bus_find_device_by_name for new memstick stuff Cc: Greg KH Cc: Alex Dubov Signed-off-by: Andrew Morton --- drivers/memstick/host/jmb38x_ms.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff -puN drivers/memstick/host/jmb38x_ms.c~fix-gregkh-driver-net-convert-the-phy_device-file-to-use-bus_find_device_by_name drivers/memstick/host/jmb38x_ms.c --- a/drivers/memstick/host/jmb38x_ms.c~fix-gregkh-driver-net-convert-the-phy_device-file-to-use-bus_find_device_by_name +++ a/drivers/memstick/host/jmb38x_ms.c @@ -341,15 +341,15 @@ static int jmb38x_ms_issue_cmd(struct me 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; @@ -429,7 +429,7 @@ static int jmb38x_ms_issue_cmd(struct me 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; } @@ -442,11 +442,11 @@ static void jmb38x_ms_complete_cmd(struc 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)); if (host->req->get_int_reg) { t_val = readl(host->addr + TPC_P0); _