aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/misc/tifm_7xx1.c
diff options
context:
space:
mode:
authorTony Jones <tonyj@suse.de>2007-09-24 20:03:03 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2008-01-24 23:40:06 -0500
commit7dd817d083b6fc103b9ea4f2b4f4a1c6a09e29a0 (patch)
tree2e9e782982555e99cb4e40cde469699696470e15 /drivers/misc/tifm_7xx1.c
parent6013c12be8313b3205b41912d965b03f3b06147d (diff)
tifm: Convert from class_device to device for TI flash media
Signed-off-by: Tony Jones <tonyj@suse.de> Cc: Alex Dubov <oakad@yahoo.com> Cc: Kay Sievers <kay.sievers@vrfy.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/misc/tifm_7xx1.c')
-rw-r--r--drivers/misc/tifm_7xx1.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/misc/tifm_7xx1.c b/drivers/misc/tifm_7xx1.c
index 2d1b3df95c5b..54380da343a5 100644
--- a/drivers/misc/tifm_7xx1.c
+++ b/drivers/misc/tifm_7xx1.c
@@ -149,7 +149,7 @@ static void tifm_7xx1_switch_media(struct work_struct *work)
149 socket_change_set = fm->socket_change_set; 149 socket_change_set = fm->socket_change_set;
150 fm->socket_change_set = 0; 150 fm->socket_change_set = 0;
151 151
152 dev_dbg(fm->cdev.dev, "checking media set %x\n", 152 dev_dbg(fm->dev.parent, "checking media set %x\n",
153 socket_change_set); 153 socket_change_set);
154 154
155 if (!socket_change_set) { 155 if (!socket_change_set) {
@@ -164,7 +164,7 @@ static void tifm_7xx1_switch_media(struct work_struct *work)
164 if (sock) { 164 if (sock) {
165 printk(KERN_INFO 165 printk(KERN_INFO
166 "%s : demand removing card from socket %u:%u\n", 166 "%s : demand removing card from socket %u:%u\n",
167 fm->cdev.class_id, fm->id, cnt); 167 fm->dev.bus_id, fm->id, cnt);
168 fm->sockets[cnt] = NULL; 168 fm->sockets[cnt] = NULL;
169 sock_addr = sock->addr; 169 sock_addr = sock->addr;
170 spin_unlock_irqrestore(&fm->lock, flags); 170 spin_unlock_irqrestore(&fm->lock, flags);