diff options
| author | Kay Sievers <kay.sievers@vrfy.org> | 2009-01-06 10:44:38 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-01-06 10:44:38 -0800 |
| commit | 0252c3b4f0188ceb9ce48a340e6bfd17ab28afa7 (patch) | |
| tree | 3e60fff61d761562b3db6f3c7cf29f30b2b2065d /drivers/memstick/host | |
| parent | 1bb5beb49f8f32c5293cae0695db2492804772a3 (diff) | |
| download | linux-0252c3b4f0188ceb9ce48a340e6bfd17ab28afa7.tar.bz2 | |
memstick: struct device - replace bus_id with dev_name(), dev_set_name()
Cc: Alex Dubov <oakad@yahoo.com>
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/memstick/host')
| -rw-r--r-- | drivers/memstick/host/tifm_ms.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/memstick/host/tifm_ms.c b/drivers/memstick/host/tifm_ms.c index d32d6ad8f3fc..03f71a431c82 100644 --- a/drivers/memstick/host/tifm_ms.c +++ b/drivers/memstick/host/tifm_ms.c @@ -546,7 +546,7 @@ static void tifm_ms_abort(unsigned long data) printk(KERN_ERR "%s : card failed to respond for a long period of time " "(%x, %x)\n", - host->dev->dev.bus_id, host->req ? host->req->tpc : 0, + dev_name(&host->dev->dev), host->req ? host->req->tpc : 0, host->cmd_flags); tifm_eject(host->dev); @@ -561,7 +561,7 @@ static int tifm_ms_probe(struct tifm_dev *sock) if (!(TIFM_SOCK_STATE_OCCUPIED & readl(sock->addr + SOCK_PRESENT_STATE))) { printk(KERN_WARNING "%s : card gone, unexpectedly\n", - sock->dev.bus_id); + dev_name(&sock->dev)); return rc; } |