pcmcia: don't add extra DEBUG cflag

[karo-tx-linux.git] / drivers / pcmcia / cs_internal.h

diff --git a/drivers/pcmcia/cs_internal.h b/drivers/pcmcia/cs_internal.h
index 63dc1a28bda2772d6f2f213656ce07223cd8dd6c..481a823c94b44b0b614ff3c8d9a09bfec3d66b70 100644 (file)
--- a/drivers/pcmcia/cs_internal.h
+++ b/drivers/pcmcia/cs_internal.h
@@ -130,15 +130,13 @@ struct pcmcia_callback{
 
 int pccard_register_pcmcia(struct pcmcia_socket *s, struct pcmcia_callback *c);
 
-#define cs_socket_name(skt)    ((skt)->dev.bus_id)
-
-#ifdef DEBUG
+#ifdef CONFIG_PCMCIA_DEBUG
 extern int cs_debug_level(int);
 
 #define cs_dbg(skt, lvl, fmt, arg...) do {             \
        if (cs_debug_level(lvl))                        \
-               printk(KERN_DEBUG "cs: %s: " fmt,       \
-                      cs_socket_name(skt) , ## arg);   \
+               dev_printk(KERN_DEBUG, &skt->dev,       \
+                "cs: " fmt, ## arg);                   \
 } while (0)
 
 #else
@@ -146,6 +144,6 @@ extern int cs_debug_level(int);
 #endif
 
 #define cs_err(skt, fmt, arg...) \
-       printk(KERN_ERR "cs: %s: " fmt, (skt)->dev.bus_id , ## arg)
+       dev_printk(KERN_ERR, &skt->dev, "cs: " fmt, ## arg)
 
 #endif /* _LINUX_CS_INTERNAL_H */