diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-09-12 11:00:10 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2007-02-07 13:37:11 -0500 |
commit | 873733188a019acdb7fa253011cbdc0a8afd97f3 (patch) | |
tree | 99828bd5db2f183e1b2d2204dc2c94bd1f8fdbbb /drivers/pcmcia/cs_internal.h | |
parent | 31b9025aa0f89b392077db3f87458fd46bcc4f58 (diff) |
Driver core: convert pcmcia code to use struct device
Converts from using struct "class_device" to "struct device" making
everything show up properly in /sys/devices/ with symlinks from the
/sys/class directory.
Cc: <linux-pcmcia@lists.infradead.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/pcmcia/cs_internal.h')
-rw-r--r-- | drivers/pcmcia/cs_internal.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pcmcia/cs_internal.h b/drivers/pcmcia/cs_internal.h index f573ea04db6f..9fa207e3c7b3 100644 --- a/drivers/pcmcia/cs_internal.h +++ b/drivers/pcmcia/cs_internal.h | |||
@@ -142,7 +142,7 @@ struct pcmcia_callback{ | |||
142 | 142 | ||
143 | int pccard_register_pcmcia(struct pcmcia_socket *s, struct pcmcia_callback *c); | 143 | int pccard_register_pcmcia(struct pcmcia_socket *s, struct pcmcia_callback *c); |
144 | 144 | ||
145 | #define cs_socket_name(skt) ((skt)->dev.class_id) | 145 | #define cs_socket_name(skt) ((skt)->dev.bus_id) |
146 | 146 | ||
147 | #ifdef DEBUG | 147 | #ifdef DEBUG |
148 | extern int cs_debug_level(int); | 148 | extern int cs_debug_level(int); |
@@ -158,6 +158,6 @@ extern int cs_debug_level(int); | |||
158 | #endif | 158 | #endif |
159 | 159 | ||
160 | #define cs_err(skt, fmt, arg...) \ | 160 | #define cs_err(skt, fmt, arg...) \ |
161 | printk(KERN_ERR "cs: %s: " fmt, (skt)->dev.class_id , ## arg) | 161 | printk(KERN_ERR "cs: %s: " fmt, (skt)->dev.bus_id , ## arg) |
162 | 162 | ||
163 | #endif /* _LINUX_CS_INTERNAL_H */ | 163 | #endif /* _LINUX_CS_INTERNAL_H */ |