pcmcia: use dev_printk in module pcmcia_core

Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>

pcmcia: use dev_printk in module pcmcia_core
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Dominik Brodowski
1 parent dd797d81d3
Showing 3 changed files with 17 additions and 12 deletions Side-by-side Diff
drivers/pcmcia/cistpl.c
drivers/pcmcia/cs.c
drivers/pcmcia/cs_internal.h
@@ -92,7 +92,8 @@
 	if (!(s->features & SS_CAP_STATIC_MAP) && (mem->res == NULL)) {
 		mem->res = pcmcia_find_mem_region(0, s->map_size, s->map_size, 0, s);
 		if (mem->res == NULL) {
-			printk(KERN_NOTICE "cs: unable to map card memory!\n");
+			dev_printk(KERN_NOTICE, &s->dev,
+				   "cs: unable to map card memory!\n");
 			return NULL;
 		}
 		s->cis_virt = NULL;
@@ -247,7 +247,8 @@
  
 	wait_for_completion(&socket->thread_done);
 	if (!socket->thread) {
-		printk(KERN_WARNING "PCMCIA: warning: socket thread for socket %p did not start\n", socket);
+		dev_printk(KERN_WARNING, &socket->dev,
+			   "PCMCIA: warning: socket thread did not start\n");
 		return -EIO;
 	}
  
@@ -412,7 +413,8 @@
  
 	s->ops->get_status(s, &status);
 	if (status & SS_POWERON) {
-		printk(KERN_ERR "PCMCIA: socket %p: *** DANGER *** unable to remove socket power\n", s);
+		dev_printk(KERN_ERR, &s->dev,
+			   "*** DANGER *** unable to remove socket power\n");
 	}
  
 	cs_socket_put(s);
@@ -508,9 +510,10 @@
 	if (ret == CS_SUCCESS) {
 		skt->state |= SOCKET_PRESENT;
  
-		printk(KERN_NOTICE "pccard: %s card inserted into slot %d\n",
-		       (skt->state & SOCKET_CARDBUS) ? "CardBus" : "PCMCIA",
-		       skt->sock);
+		dev_printk(KERN_NOTICE, &skt->dev,
+			   "pccard: %s card inserted into slot %d\n",
+			   (skt->state & SOCKET_CARDBUS) ? "CardBus" : "PCMCIA",
+			   skt->sock);
  
 #ifdef CONFIG_CARDBUS
 		if (skt->state & SOCKET_CARDBUS) {
@@ -595,7 +598,8 @@
  
 static void socket_remove(struct pcmcia_socket *skt)
 {
-	printk(KERN_NOTICE "pccard: card ejected from slot %d\n", skt->sock);
+	dev_printk(KERN_NOTICE, &skt->dev,
+		   "pccard: card ejected from slot %d\n", skt->sock);
 	socket_shutdown(skt);
 }
  
@@ -641,8 +645,8 @@
 	/* register with the device core */
 	ret = device_register(&skt->dev);
 	if (ret) {
-		printk(KERN_WARNING "PCMCIA: unable to register socket 0x%p\n",
-			skt);
+		dev_printk(KERN_WARNING, &skt->dev,
+			   "PCMCIA: unable to register socket\n");
 		skt->thread = NULL;
 		complete(&skt->thread_done);
 		return 0;
@@ -137,8 +137,8 @@
  
 #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,7 +146,7 @@
 #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 */
...	...	@@ -92,7 +92,8 @@
92	92	if (!(s->features & SS_CAP_STATIC_MAP) && (mem->res == NULL)) {
93	93	mem->res = pcmcia_find_mem_region(0, s->map_size, s->map_size, 0, s);
94	94	if (mem->res == NULL) {
95		- printk(KERN_NOTICE "cs: unable to map card memory!\n");
	95	+ dev_printk(KERN_NOTICE, &s->dev,
	96	+ "cs: unable to map card memory!\n");
96	97	return NULL;
97	98	}
98	99	s->cis_virt = NULL;
...	...	@@ -247,7 +247,8 @@
247	247
248	248	wait_for_completion(&socket->thread_done);
249	249	if (!socket->thread) {
250		- printk(KERN_WARNING "PCMCIA: warning: socket thread for socket %p did not start\n", socket);
	250	+ dev_printk(KERN_WARNING, &socket->dev,
	251	+ "PCMCIA: warning: socket thread did not start\n");
251	252	return -EIO;
252	253	}
253	254
...	...	@@ -412,7 +413,8 @@
412	413
413	414	s->ops->get_status(s, &status);
414	415	if (status & SS_POWERON) {
415		- printk(KERN_ERR "PCMCIA: socket %p: * DANGER * unable to remove socket power\n", s);
	416	+ dev_printk(KERN_ERR, &s->dev,
	417	+ "* DANGER * unable to remove socket power\n");
416	418	}
417	419
418	420	cs_socket_put(s);
...	...	@@ -508,9 +510,10 @@
508	510	if (ret == CS_SUCCESS) {
509	511	skt->state \|= SOCKET_PRESENT;
510	512
511		- printk(KERN_NOTICE "pccard: %s card inserted into slot %d\n",
512		- (skt->state & SOCKET_CARDBUS) ? "CardBus" : "PCMCIA",
513		- skt->sock);
	513	+ dev_printk(KERN_NOTICE, &skt->dev,
	514	+ "pccard: %s card inserted into slot %d\n",
	515	+ (skt->state & SOCKET_CARDBUS) ? "CardBus" : "PCMCIA",
	516	+ skt->sock);
514	517
515	518	#ifdef CONFIG_CARDBUS
516	519	if (skt->state & SOCKET_CARDBUS) {
...	...	@@ -595,7 +598,8 @@
595	598
596	599	static void socket_remove(struct pcmcia_socket *skt)
597	600	{
598		- printk(KERN_NOTICE "pccard: card ejected from slot %d\n", skt->sock);
	601	+ dev_printk(KERN_NOTICE, &skt->dev,
	602	+ "pccard: card ejected from slot %d\n", skt->sock);
599	603	socket_shutdown(skt);
600	604	}
601	605
...	...	@@ -641,8 +645,8 @@
641	645	/* register with the device core */
642	646	ret = device_register(&skt->dev);
643	647	if (ret) {
644		- printk(KERN_WARNING "PCMCIA: unable to register socket 0x%p\n",
645		- skt);
	648	+ dev_printk(KERN_WARNING, &skt->dev,
	649	+ "PCMCIA: unable to register socket\n");
646	650	skt->thread = NULL;
647	651	complete(&skt->thread_done);
648	652	return 0;
...	...	@@ -137,8 +137,8 @@
137	137
138	138	#define cs_dbg(skt, lvl, fmt, arg...) do { \
139	139	if (cs_debug_level(lvl)) \
140		- printk(KERN_DEBUG "cs: %s: " fmt, \
141		- cs_socket_name(skt) , ## arg); \
	140	+ dev_printk(KERN_DEBUG, &skt->dev, \
	141	+ "cs: " fmt, ## arg); \
142	142	} while (0)
143	143
144	144	#else
...	...	@@ -146,7 +146,7 @@
146	146	#endif
147	147
148	148	#define cs_err(skt, fmt, arg...) \
149		- printk(KERN_ERR "cs: %s: " fmt, (skt)->dev.bus_id , ## arg)
	149	+ dev_printk(KERN_ERR, &skt->dev, "cs: " fmt, ## arg)
150	150
151	151	#endif /* _LINUX_CS_INTERNAL_H */