Skip to contentSkip to conversation

Remove concatenation with

PATCH In review Tony Breeds 3 participants 19 messages Mar 22, 2004 – Apr 4, 2004

Subsystems (20)
Networking Network drivers Arm (32-bit) Media (V4L/DVB) +16 more subsystems
lore
Share & tools
lore

Tony Breeds

author
#0 lore raw

PATCH 2/5 Remove concatenation with

--------------------------------------------------------------------------------

drivers/char/ftape/lowlevel/ftape-tracing.h +2 -2
diff -X /root/dontdiff -u -prN linux-2.6.4.clean/drivers/char/ftape/lowlevel/ftape-tracing.h linux-2.6.4.kj_func/drivers/char/ftape/lowlevel/ftape-tracing.h
@@ -70,8 +70,8 @@ typedef enum {
 #define TRACE(l, m, i...)						\
 {									\
 	if ((ft_trace_t)(l) = FT_TRACE_TOP_LEVEL) {			\
-		printk(KERN_INFO"ftape"__FILE__"("__FUNCTION__"):\n"	\
-		       KERN_INFO m".\n" ,##i);				\
+		printk(KERN_INFO"ftape%s(%s):\n"	                \
+		       KERN_INFO m".\n" ,__FILE__, __FUNCTION__, ##i);	\
 	}								\
 }
 #define SET_TRACE_LEVEL(l)      if ((l) = (l)) do {} while(0)
drivers/char/serial_tx3912.h +2 -2
diff -X /root/dontdiff -u -prN linux-2.6.4.clean/drivers/char/serial_tx3912.h linux-2.6.4.kj_func/drivers/char/serial_tx3912.h
@@ -59,9 +59,9 @@ int rs_debug = TX3912_UART_DEBUG_ALL & ~
 
 #define rs_dprintk(f, str...) if (rs_debug & f) printk (str)
 #define func_enter() rs_dprintk (TX3912_UART_DEBUG_FLOW,	\
-				"rs: enter " __FUNCTION__ "\n")
+				"rs: enter %s\n", __FUNCTION__)
 #define func_exit() rs_dprintk (TX3912_UART_DEBUG_FLOW,	\
-				"rs: exit " __FUNCTION__ "\n")
+				"rs: exit %s\n", __FUNCTION__)
 
 #else
 #define rs_dprintk(f, str...)
drivers/char/watchdog/machzwd.c +1 -1
diff -X /root/dontdiff -u -prN linux-2.6.4.clean/drivers/char/watchdog/machzwd.c linux-2.6.4.kj_func/drivers/char/watchdog/machzwd.c
@@ -151,7 +151,7 @@ static unsigned long next_heartbeat = 0;
 #ifndef ZF_DEBUG
 #	define dprintk(format, args...)
 #else
-#	define dprintk(format, args...) printk(KERN_DEBUG PFX; ":" __FUNCTION__ ":%d: " format, __LINE__ , ## args)
+#	define dprintk(format, args...) printk(KERN_DEBUG PFX ":%s:%d: " format, __FUNCTION__, __LINE__ , ## args)
 #endif
drivers/isdn/i4l/isdn_net.h +6 -6
diff -X /root/dontdiff -u -prN linux-2.6.4.clean/drivers/isdn/i4l/isdn_net.h linux-2.6.4.kj_func/drivers/isdn/i4l/isdn_net.h
@@ -106,8 +106,8 @@ static __inline__ void isdn_net_add_to_b
 	spin_lock_irqsave(&nd->queue_lock, flags);
 
 	lp = nd->queue;
-//	printk(KERN_DEBUG __FUNCTION__": lp:%s(%p) nlp:%s(%p) last(%p)\n",
-//		lp->name, lp, nlp->name, nlp, lp->last); 
+//	printk(KERN_DEBUG "%s: lp:%s(%p) nlp:%s(%p) last(%p)\n",
+//		__FUNCTION__, lp->name, lp, nlp->name, nlp, lp->last); 
 	nlp->last = lp->last;
 	lp->last->next = nlp;
 	lp->last = nlp;

@@ -127,8 +127,8 @@ static __inline__ void isdn_net_rm_from_
 	if (lp->master)
 		master_lp = (isdn_net_local *) lp->master->priv;
 
-//	printk(KERN_DEBUG __FUNCTION__": lp:%s(%p) mlp:%s(%p) last(%p) next(%p) mndq(%p)\n",
-//		lp->name, lp, master_lp->name, master_lp, lp->last, lp->next, master_lp->netdev->queue); 
+//	printk(KERN_DEBUG "%s: lp:%s(%p) mlp:%s(%p) last(%p) next(%p) mndq(%p)\n",
+//		__FUNCTION__, lp->name, lp, master_lp->name, master_lp, lp->last, lp->next, master_lp->netdev->queue); 
 	spin_lock_irqsave(&master_lp->netdev->queue_lock, flags);
 	lp->last->next = lp->next;
 	lp->next->last = lp->last;

@@ -139,8 +139,8 @@ static __inline__ void isdn_net_rm_from_
 		}
 	}
 	lp->next = lp->last = lp;	/* (re)set own pointers */
-//	printk(KERN_DEBUG __FUNCTION__": mndq(%p)\n",
-//		master_lp->netdev->queue); 
+//	printk(KERN_DEBUG "%s: mndq(%p)\n",
+//		__FUNCTION__, master_lp->netdev->queue); 
 	spin_unlock_irqrestore(&master_lp->netdev->queue_lock, flags);
 }
drivers/media/video/w9966.c +1 -1
diff -X /root/dontdiff -u -prN linux-2.6.4.clean/drivers/media/video/w9966.c linux-2.6.4.kj_func/drivers/media/video/w9966.c
@@ -63,7 +63,7 @@
 //#define DEBUG				// Undef me for production
 
 #ifdef DEBUG
-#define DPRINTF(x, a...) printk(KERN_DEBUG "W9966: "__FUNCTION__ "(): "x, ##a)
+#define DPRINTF(x, a...) printk(KERN_DEBUG "W9966: %s(): "x, __FUNCTION__, ##a)
 #else
 #define DPRINTF(x...)
 #endif
drivers/mtd/chips/cfi_cmdset_0001.c +1 -1
diff -X /root/dontdiff -u -prN linux-2.6.4.clean/drivers/mtd/chips/cfi_cmdset_0001.c linux-2.6.4.kj_func/drivers/mtd/chips/cfi_cmdset_0001.c
@@ -1575,7 +1575,7 @@ static int cfi_intelext_lock(struct mtd_
 					ofs, len, DO_XXLOCK_ONEBLOCK_LOCK);
 	
 #ifdef DEBUG_LOCK_BITS
-	printk(KERN_DEBUG __FUNCTION__
+	printk(KERN_DEBUG 
 	       "%s: lock status after, ret=%d\n", __FUNCTION__, ret);
 	cfi_intelext_varsize_frob(mtd, do_printlockstatus_oneblock,
 				  ofs, len, 0);
drivers/net/gt96100eth.c +1 -1
diff -X /root/dontdiff -u -prN linux-2.6.4.clean/drivers/net/gt96100eth.c linux-2.6.4.kj_func/drivers/net/gt96100eth.c
@@ -1212,7 +1212,7 @@ gt96100_rx(struct net_device *dev, u32 s
 		    cmdstat, nextOut);
 
 		if (cmdstat & (u32)rxOwn) {
-			//err(__FUNCTION__ ": device owns descriptor!\n");
+			//err("%s: device owns descriptor!\n", __FUNCTION__);
 			// DMA is not finished updating descriptor???
 			// Leave and come back later to pick-up where
 			// we left off.
drivers/net/irda/smsc-ircc2.c +3 -3
diff -X /root/dontdiff -u -prN linux-2.6.4.clean/drivers/net/irda/smsc-ircc2.c linux-2.6.4.kj_func/drivers/net/irda/smsc-ircc2.c
@@ -1429,7 +1429,7 @@ static irqreturn_t smsc_ircc_interrupt(i
 	}
 
 	if (iir & IRCC_IIR_ACTIVE_FRAME) {
-		/*printk(KERN_WARNING __FUNCTION__ "(): Active Frame\n");*/
+		/*printk(KERN_WARNING "%s(): Active Frame\n", __FUNCTION__);*/
 	}
 
 	/* Enable interrupts again */

@@ -1995,7 +1995,7 @@ static int __init smsc_ircc_look_for_chi
 	while(address->cfg_base){
 		cfg_base = address->cfg_base;
 		
-		/*printk(KERN_WARNING __FUNCTION__ "(): probing: 0x%02x for: 0x%02x\n", cfg_base, address->type);*/
+		/*printk(KERN_WARNING "%s(): probing: 0x%02x for: 0x%02x\n", __FUNCTION__, cfg_base, address->type);*/
 		
 		if( address->type & SMSCSIO_TYPE_FDC){
 			type = "FDC";

@@ -2040,7 +2040,7 @@ static int __init smsc_superio_flat(cons
 	outb(SMSCSIOFLAT_UARTMODE0C_REG, cfgbase);
 	mode = inb(cfgbase+1);
 	
-	/*printk(KERN_WARNING __FUNCTION__ "(): mode: 0x%02x\n", mode);*/
+	/*printk(KERN_WARNING "%s(): mode: 0x%02x\n", __FUNCTION__, mode);*/
 	
 	if(!(mode & SMSCSIOFLAT_UART2MODE_VAL_IRDA))
 		WARNING("%s(): IrDA not enabled\n", __FUNCTION__);
drivers/net/irda/via-ircc.c +1 -1
diff -X /root/dontdiff -u -prN linux-2.6.4.clean/drivers/net/irda/via-ircc.c linux-2.6.4.kj_func/drivers/net/irda/via-ircc.c
@@ -360,7 +360,7 @@ static __devinit int via_ircc_open(int i
 
 	/* Reserve the ioports that we need */
 	if (!request_region(self->io.fir_base, self->io.fir_ext, driver_name)) {
-//              WARNING(__FUNCTION__ "(), can't get iobase of 0x%03x\n",self->io.fir_base);
+//              WARNING("%s(), can't get iobase of 0x%03x\n", __FUNCTION__, self->io.fir_base);
 		err = -ENODEV;
 		goto err_out1;
 	}
drivers/net/wireless/orinoco.h +2 -2
diff -X /root/dontdiff -u -prN linux-2.6.4.clean/drivers/net/wireless/orinoco.h linux-2.6.4.kj_func/drivers/net/wireless/orinoco.h
@@ -125,8 +125,8 @@ extern int orinoco_debug;
 #define DEBUG(n, args...) do { } while (0)
 #endif	/* ORINOCO_DEBUG */
 
-#define TRACE_ENTER(devname) DEBUG(2, "%s: -> " __FUNCTION__ "()\n", devname);
-#define TRACE_EXIT(devname)  DEBUG(2, "%s: <- " __FUNCTION__ "()\n", devname);
+#define TRACE_ENTER(devname) DEBUG(2, "%s: -> %s()\n", __FUNCTION__, devname);
+#define TRACE_EXIT(devname)  DEBUG(2, "%s: <- %s()\n", __FUNCTION__, devname);
 
 extern struct net_device *alloc_orinocodev(int sizeof_card,
 					   int (*hard_reset)(struct orinoco_private *));
drivers/pci/hotplug/pcihp_skeleton.c +5 -5
diff -X /root/dontdiff -u -prN linux-2.6.4.clean/drivers/pci/hotplug/pcihp_skeleton.c linux-2.6.4.kj_func/drivers/pci/hotplug/pcihp_skeleton.c
@@ -224,7 +224,7 @@ static int get_power_status (struct hotp
 	if (slot = NULL)
 		return -ENODEV;
 	
-	dbg(__FUNCTION__" - physical_slot = %s\n", hotplug_slot->name);
+	dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name);
 
 	/*
 	 * Fill in logic to get the current power status of the specific

@@ -242,7 +242,7 @@ static int get_attention_status (struct 
 	if (slot = NULL)
 		return -ENODEV;
 	
-	dbg(__FUNCTION__" - physical_slot = %s\n", hotplug_slot->name);
+	dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name);
 
 	/*
 	 * Fill in logic to get the current attention status of the specific

@@ -260,7 +260,7 @@ static int get_latch_status (struct hotp
 	if (slot = NULL)
 		return -ENODEV;
 	
-	dbg(__FUNCTION__" - physical_slot = %s\n", hotplug_slot->name);
+	dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name);
 
 	/*
 	 * Fill in logic to get the current latch status of the specific

@@ -278,7 +278,7 @@ static int get_adapter_status (struct ho
 	if (slot = NULL)
 		return -ENODEV;
 	
-	dbg(__FUNCTION__" - physical_slot = %s\n", hotplug_slot->name);
+	dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name);
 
 	/*
 	 * Fill in logic to get the current adapter status of the specific

@@ -296,7 +296,7 @@ static void release_slots(struct hotplug
 	if (slot = NULL)
 		return -ENODEV;
 
-	dbg(__FUNCTION__" - physical_slot = %s\n", hotplug_slot->name);
+	dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name);
 	kfree(slot->hotplug_slot->info);
 	kfree(slot->hotplug_slot->name);
 	kfree(slot->hotplug_slot);
drivers/pcmcia/sa1100_pfs168.c +1 -1
diff -X /root/dontdiff -u -prN linux-2.6.4.clean/drivers/pcmcia/sa1100_pfs168.c linux-2.6.4.kj_func/drivers/pcmcia/sa1100_pfs168.c
@@ -101,7 +101,7 @@ pfs168_pcmcia_configure_socket(struct sa
     }
 
     if (state->Vpp != state->Vcc && state->Vpp != 0) {
-      printk(KERN_ERR "%s(): CompactFlash socket does not support VPP %uV\n"
+      printk(KERN_ERR "%s(): CompactFlash socket does not support VPP %uV\n",
 	     __FUNCTION__, state->Vpp / 10);
       return -1;
     }
drivers/pcmcia/sa1100_shannon.c +5 -5
diff -X /root/dontdiff -u -prN linux-2.6.4.clean/drivers/pcmcia/sa1100_shannon.c linux-2.6.4.kj_func/drivers/pcmcia/sa1100_shannon.c
@@ -74,19 +74,19 @@ shannon_pcmcia_configure_socket(struct s
 {
 	switch (state->Vcc) {
 	case 0:	/* power off */
-		printk(KERN_WARNING __FUNCTION__"(): CS asked for 0V, still applying 3.3V..\n");
+		printk(KERN_WARNING "%s(): CS asked for 0V, still applying 3.3V..\n", __FUNCTION__);
 		break;
 	case 50:
-		printk(KERN_WARNING __FUNCTION__"(): CS asked for 5V, applying 3.3V..\n");
+		printk(KERN_WARNING "%s(): CS asked for 5V, applying 3.3V..\n", __FUNCTION__);
 	case 33:
 		break;
 	default:
-		printk(KERN_ERR __FUNCTION__"(): unrecognized Vcc %u\n",
-		       state->Vcc);
+		printk(KERN_ERR _"%s(): unrecognized Vcc %u\n",
+		       __FUNCTION__, state->Vcc);
 		return -1;
 	}
 
-	printk(KERN_WARNING __FUNCTION__"(): Warning, Can't perform reset\n");
+	printk(KERN_WARNING "%s(): Warning, Can't perform reset\n", __FUNCTION__);
 	
 	/* Silently ignore Vpp, output enable, speaker enable. */
drivers/pcmcia/sa1100_stork.c +2 -2
diff -X /root/dontdiff -u -prN linux-2.6.4.clean/drivers/pcmcia/sa1100_stork.c linux-2.6.4.kj_func/drivers/pcmcia/sa1100_stork.c
@@ -50,7 +50,7 @@ static void stork_pcmcia_hw_shutdown(str
 {
 	int i;
 
-        printk(__FUNCTION__ "\n");
+        printk("%s\n", __FUNCTION__);
 
         /* disable IRQs */
         sa11xx_free_irqs(skt, irqs, ARRAY_SIZE(irqs));

@@ -68,7 +68,7 @@ stork_pcmcia_socket_state(struct sa1100_
         unsigned long levels = GPLR;
 
 	if (debug > 1)
-		printk(__FUNCTION__ " GPLR=%x IRQ[1:0]=%x\n", levels,
+		printk("%s GPLR=%x IRQ[1:0]=%x\n", __FUNCTION__, levels,
 			(levels & (GPIO_STORK_PCMCIA_A_RDY|GPIO_STORK_PCMCIA_B_RDY)));
 
 	switch (skt->nr) {
drivers/pcmcia/sa1100_yopy.c +3 -3
diff -X /root/dontdiff -u -prN linux-2.6.4.clean/drivers/pcmcia/sa1100_yopy.c linux-2.6.4.kj_func/drivers/pcmcia/sa1100_yopy.c
@@ -76,13 +76,13 @@ yopy_pcmcia_configure_socket(struct sa11
 		pcmcia_power(0);
 		break;
 	case 50:
-		printk(KERN_WARNING __FUNCTION__"(): CS asked for 5V, applying 3.3V..\n");
+		printk(KERN_WARNING "%s(): CS asked for 5V, applying 3.3V..\n", __FUNCTION__);
 	case 33:
 		pcmcia_power(1);
 		break;
 	default:
-		printk(KERN_ERR __FUNCTION__"(): unrecognized Vcc %u\n",
-		       state->Vcc);
+		printk(KERN_ERR "%s(): unrecognized Vcc %u\n",
+		       __FUNCTION__, state->Vcc);
 		return -1;
 	}
drivers/scsi/pcmcia/nsp_debug.c +1 -1
diff -X /root/dontdiff -u -prN linux-2.6.4.clean/drivers/scsi/pcmcia/nsp_debug.c linux-2.6.4.kj_func/drivers/scsi/pcmcia/nsp_debug.c
@@ -90,7 +90,7 @@ static void print_commandk (unsigned cha
 	int i, s;
 	printk(KERN_DEBUG);
 	print_opcodek(command[0]);
-	/*printk(KERN_DEBUG __FUNCTION__ " ");*/
+	/*printk(KERN_DEBUG "%s ", __FUNCTION__);*/
 	if ((command[0] >> 5) = 6 ||
 	    (command[0] >> 5) = 7 ) {
 		s = 12; /* vender specific */
drivers/tc/lk201.c +1 -1
diff -X /root/dontdiff -u -prN linux-2.6.4.clean/drivers/tc/lk201.c linux-2.6.4.kj_func/drivers/tc/lk201.c
@@ -74,7 +74,7 @@ static int __init lk201_reset(struct dec
 
 	for (i = 0; i < sizeof(lk201_reset_string); i++)
 		if (info->hook->poll_tx_char(info, lk201_reset_string[i])) {
-			printk(__FUNCTION__" transmit timeout\n");
+			printk("%s transmit timeout\n", __FUNCTION__);
 			return -EIO;
 		}
 	return 0;
drivers/tc/zs.c +4 -3
diff -X /root/dontdiff -u -prN linux-2.6.4.clean/drivers/tc/zs.c linux-2.6.4.kj_func/drivers/tc/zs.c
@@ -1988,7 +1988,8 @@ unsigned int register_zs_hook(unsigned i
 	struct dec_serial *info = &zs_soft[channel];
 
 	if (info->hook) {
-		printk(__FUNCTION__": line %d has already a hook registered\n", channel);
+		printk("%s: line %d has already a hook registered\n",
+		       __FUNCTION__, channel);
 
 		return 0;
 	} else {

@@ -2015,8 +2016,8 @@ unsigned int unregister_zs_hook(unsigned
                 info->hook = NULL;
                 return 1;
         } else {
-                printk(__FUNCTION__": trying to unregister hook on line %d,"
-                       " but none is registered\n", channel);
+                printk("%s: trying to unregister hook on line %d,"
+                       " but none is registered\n", __FUNCTION__, channel);
                 return 0;
         }
 }
drivers/usb/serial/kobil_sct.c +1 -1
diff -X /root/dontdiff -u -prN linux-2.6.4.clean/drivers/usb/serial/kobil_sct.c linux-2.6.4.kj_func/drivers/usb/serial/kobil_sct.c
@@ -503,7 +503,7 @@ static int kobil_write (struct usb_seria
 
 static int kobil_write_room (struct usb_serial_port *port)
 {
-	//dbg(__FUNCTION__ " - port %d", port->number);
+	//dbg("%s - port %d", __FUNCTION__, port->number);
 	return 8;
 }

--------------------------------------------------------------------------------

Yours Tony

linux.conf.au http://lca2005.linux.org.au/
Apr 18-23 2005 The Australian Linux Technical Conference!

_______________________________________________
Kernel-janitors mailing list
[email protected]
http://lists.osdl.org/mailman/listinfo/kernel-janitors

maintainer
#1 lore raw

drivers/char/ftape/lowlevel/ftape-tracing.h typedef enum { · line 74

Quoted 8 lines · Tony Breeds
drivers/char/ftape/lowlevel/ftape-tracing.h +2 -2
@@ -70,8 +70,8 @@ typedef enum {
 #define TRACE(l, m, i...)						\
 {									\
 	if ((ft_trace_t)(l) = FT_TRACE_TOP_LEVEL) {			\
-		printk(KERN_INFO"ftape"__FILE__"("__FUNCTION__"):\n"	\
-		       KERN_INFO m".\n" ,##i);				\
+		printk(KERN_INFO"ftape%s(%s):\n"	                \
+		       KERN_INFO m".\n" ,__FILE__, __FUNCTION__, ##i);	\

Old gcc versions (gcc-2.95 and earlier) require you to have a space in front of the ', ##', for obscure reasons. OTOH, you should use normal spacing rules for all other occurrences of ','.
The correct line should look like:

+ KERN_INFO m".\n", __FILE__, __FUNCTION__ , ##i); \

drivers/media/video/w9966.c line 67

Quoted 9 lines
drivers/media/video/w9966.c +1 -1
@@ -63,7 +63,7 @@
 //#define DEBUG				// Undef me for production
 
 #ifdef DEBUG
-#define DPRINTF(x, a...) printk(KERN_DEBUG "W9966: "__FUNCTION__ "(): "x, ##a)
+#define DPRINTF(x, a...) printk(KERN_DEBUG "W9966: %s(): "x, __FUNCTION__, ##a)
 #else

This was already broken, but you can fix it while you are at it.

Your other patches have more examples similar to these two. I wonder if we should make broken varargs macros a new janitor item or just fix those that cause trouble and deprecate gcc-2.x for linux-2.7.

	Arnd <><

_______________________________________________
Kernel-janitors mailing list
[email protected]
http://lists.osdl.org/mailman/listinfo/kernel-janitors

author
#2 lore raw

cover remove concatenation with

In reply to Tony Breeds

Hello all,
Somewhere the the recent past GCC started warning:
"concatenation of string literals with __FUNCTION__ is deprecated"

The following 5 patches work to change most of the offending code from:

	printk("Hi" __FUNCTION__ "\n"); to 
	printk("Hi%s\n.", __FUNCTION__);

In addition, these patches also "fix" the broken variags for gcc-2.95 and earlier (as pointed out by Arnd Bergmann) in files already being touched.

Feedback welcome.

Yours Tony

linux.conf.au http://lca2005.linux.org.au/
Apr 18-23 2005 The Australian Linux Technical Conference!

_______________________________________________
Kernel-janitors mailing list
[email protected]
http://lists.osdl.org/mailman/listinfo/kernel-janitors

author
#3 lore raw

PATCH 1/5 remove concatenation with

In reply to Tony Breeds

--------------------------------------------------------------------------------

arch/arm/mach-sa1100/h3600.c +7 -7
diff -X dontdiff -purN 2.6.4.clean/arch/arm/mach-sa1100/h3600.c 2.6.4.kj_func/arch/arm/mach-sa1100/h3600.c
@@ -481,7 +481,7 @@ static void h3800_control_egpio(enum ipa
 	case IPAQ_EGPIO_CODEC_NRESET:
 	case IPAQ_EGPIO_AUDIO_ON:
 	case IPAQ_EGPIO_QMUTE:
-		printk(__FUNCTION__ ": error - should not be called\n");
+		printk("%s: error - should not be called\n", __FUNCTION__);
 		break;
 	case IPAQ_EGPIO_OPT_NVRAM_ON:
 		SET_ASIC2(GPIO2_OPT_ON_NVRAM);

@@ -523,7 +523,7 @@ static int h3800_pm_callback(int req)
 	static u16 asic2_data;
 	int result = 0;
 
-	printk(__FUNCTION__ " %d\n", req);
+	printk("%s %d\n", __FUNCTION__, req);
 
 	switch (req) {
 	case PM_RESUME:

@@ -551,7 +551,7 @@ static int h3800_pm_callback(int req)
 		asic2_data = H3800_ASIC2_GPIOPIOD;
 		break;
 	default:
-		printk(__FUNCTION__ ": unrecognized PM callback\n");
+		printk("%s: unrecognized PM callback\n", __FUNCTION__);
 		break;
 	}
 	return result;

@@ -591,7 +591,7 @@ static void h3800_IRQ_demux(unsigned int
 {
 	int i;
 
-	if (0) printk(__FUNCTION__ ": interrupt received\n");
+	if (0) printk("%s: interrupt received\n",__FUNCTION__);
 
 	desc->chip->ack(irq);
 

@@ -601,21 +601,21 @@ static void h3800_IRQ_demux(unsigned int
 
 		/* KPIO */
 		irq = H3800_ASIC2_KPIINTFLAG;
-		if (0) printk(__FUNCTION__" KPIO 0x%08X\n", irq);
+		if (0) printk("%s KPIO 0x%08X\n", __FUNCTION__, irq);
 		for (j = 0; j < H3800_KPIO_IRQ_COUNT; j++)
 			if (irq & kpio_irq_mask[j])
 				do_edge_IRQ(H3800_KPIO_IRQ_COUNT + j, irq_desc + H3800_KPIO_IRQ_COUNT + j, regs);
 
 		/* GPIO2 */
 		irq = H3800_ASIC2_GPIINTFLAG;
-		if (0) printk(__FUNCTION__" GPIO 0x%08X\n", irq);
+		if (0) printk("%s GPIO 0x%08X\n", __FUNCTION__, irq);
 		for (j = 0; j < H3800_GPIO_IRQ_COUNT; j++)
 			if (irq & gpio_irq_mask[j])
 				do_edge_IRQ(H3800_GPIO_IRQ_COUNT + j, irq_desc + H3800_GPIO_IRQ_COUNT + j , regs);
 	}
 
 	if (i >= MAX_ASIC_ISR_LOOPS)
-		printk(__FUNCTION__ ": interrupt processing overrun\n");
+		printk("%s: interrupt processing overrun\n", __FUNCTION__);
 
 	/* For level-based interrupts */
 	desc->chip->unmask(irq);
arch/mips/au1000/common/usbdev.c +16 -16
diff -X dontdiff -purN 2.6.4.clean/arch/mips/au1000/common/usbdev.c 2.6.4.kj_func/arch/mips/au1000/common/usbdev.c
@@ -199,12 +199,12 @@ get_std_req_name(int req)
 static void
 dump_setup(struct usb_ctrlrequest* s)
 {
-	dbg(__FUNCTION__ ": requesttype=%d", s->requesttype);
-	dbg(__FUNCTION__ ": request=%d %s", s->request,
+	dbg("%s: requesttype=%d",__FUNCTION__, s->requesttype);
+	dbg("%s: request=%d %s", __FUNCTION__,s->request,
 	    get_std_req_name(s->request));
-	dbg(__FUNCTION__ ": value=0x%04x", s->wValue);
-	dbg(__FUNCTION__ ": index=%d", s->index);
-	dbg(__FUNCTION__ ": length=%d", s->length);
+	dbg("%s: value=0x%04x", __FUNCTION__,s->wValue);
+	dbg("%s: index=%d", __FUNCTION__,s->index);
+	dbg("%s: length=%d", __FUNCTION__,s->length);
 }
 #endif
 

@@ -436,10 +436,10 @@ kickstart_send_packet(endpoint_t * ep)
 	u32 cs;
 	usbdev_pkt_t *pkt = ep->inlist.head;
 
-	vdbg(__FUNCTION__ ": ep%d, pkt=%p", ep->address, pkt);
+	vdbg("%s: ep%d, pkt=%p",__FUNCTION__, ep->address, pkt);
 
 	if (!pkt) {
-		err(__FUNCTION__ ": head=NULL! list->count=%d",
+		err("%s: head=NULL! list->count=%d", __FUNCTION__,
 		    ep->inlist.count);
 		return;
 	}

@@ -484,7 +484,7 @@ send_packet_complete(endpoint_t * ep)
 			(au_readl(ep->reg->ctrl_stat) & USBDEV_CS_NAK) ?
 			PKT_STATUS_NAK : PKT_STATUS_ACK;
 
-		vdbg(__FUNCTION__ ": ep%d, %s pkt=%p, list count=%d",
+		vdbg("%s: ep%d, %s pkt=%p, list count=%d", __FUNCTION__
 		     ep->address, (pkt->status & PKT_STATUS_NAK) ?
 		     "NAK" : "ACK", pkt, ep->inlist.count);
 	}

@@ -529,7 +529,7 @@ send_packet(struct usb_dev* dev, usbdev_
 
 	link_tail(ep, list, pkt);
 
-	vdbg(__FUNCTION__ ": ep%d, pkt=%p, size=%d, list count=%d",
+	vdbg("%s: ep%d, pkt=%p, size=%d, list count=%d", __FUNCTION__
 	     ep->address, pkt, pkt->size, list->count);
 
 	if (list->count = 1) {

@@ -555,7 +555,7 @@ kickstart_receive_packet(endpoint_t * ep
 
 	// get and link a new packet for next reception
 	if (!(pkt = add_packet(ep, &ep->outlist, ep->max_pkt_size))) {
-		err(__FUNCTION__ ": could not alloc new packet");
+		err("%s: could not alloc new packet", __FUNCTION__);
 		return;
 	}
 

@@ -615,7 +615,7 @@ receive_packet_complete(endpoint_t * ep)
 	if (ep->address = 0 && (cs & USBDEV_CS_SU))
 		pkt->status |= PKT_STATUS_SU;
 
-	vdbg(__FUNCTION__ ": ep%d, %s pkt=%p, size=%d",
+	vdbg("%s: ep%d, %s pkt=%p, size=%d", __FUNCTION__
 	     ep->address, (pkt->status & PKT_STATUS_NAK) ?
 	     "NAK" : "ACK", pkt, pkt->size);
 

@@ -719,7 +719,7 @@ do_set_address(struct usb_dev* dev, stru
 	int new_state = dev->state;
 	int new_addr = le16_to_cpu(setup->wValue);
 
-	dbg(__FUNCTION__ ": our address=%d", new_addr);
+	dbg("%s: our address=%d", __FUNCTION__, new_addr);
 
 	if (new_addr > 127) {
 			// usb spec doesn't tell us what to do, so just go to

@@ -918,18 +918,18 @@ do_setup (struct usb_dev* dev, struct us
 {
 	req_method_t m;
 
-	dbg(__FUNCTION__ ": req %d %s", setup->bRequestType,
+	dbg("%s: req %d %s", __FUNCTION__, setup->bRequestType,
 	    get_std_req_name(setup->bRequestType));
 
 	if ((setup->bRequestType & USB_TYPE_MASK) != USB_TYPE_STANDARD ||
 	    (setup->bRequestType & USB_RECIP_MASK) != USB_RECIP_DEVICE) {
-		err(__FUNCTION__ ": invalid requesttype 0x%02x",
+		err("%s: invalid requesttype 0x%02x", __FUNCTION__,
 		    setup->bRequestType);
 		return;
 		}
 
 	if ((setup->bRequestType & 0x80) = USB_DIR_OUT && setup->wLength)
-		dbg(__FUNCTION__ ": OUT phase! length=%d", setup->wLength);
+		dbg("%s: OUT phase! length=%d", __FUNCTION__, setup->wLength);
 
 	if (setup->bRequestType < sizeof(req_method)/sizeof(req_method_t))
 		m = req_method[setup->bRequestType];

@@ -980,7 +980,7 @@ process_ep0_receive (struct usb_dev* dev
 #endif
 			do_setup(dev, (struct usb_ctrlrequest*)pkt->payload);
 		} else
-			err(__FUNCTION__ ": wrong size SETUP received");
+			err("%s: wrong size SETUP received", __FUNCTION__);
 		break;
 	case DATA_STAGE:
 		/*
arch/mips/mm-64/tlb-dbg-r4k.c +1 -1
diff -X dontdiff -purN 2.6.4.clean/arch/mips/mm-64/tlb-dbg-r4k.c 2.6.4.kj_func/arch/mips/mm-64/tlb-dbg-r4k.c
@@ -24,7 +24,7 @@ asmlinkage void do_page_fault(struct pt_
 asmlinkage void tlb_refill_debug(struct pt_regs regs)
 {
 	show_regs(&regs);
-	panic(__FUNCTION__ " called.  This Does Not Happen (TM).");
+	panic("%s called.  This Does Not Happen (TM).", __FUNCTION__);
 }
 
 asmlinkage void xtlb_refill_debug(struct pt_regs *regs)

--------------------------------------------------------------------------------
Yours Tony

linux.conf.au http://lca2005.linux.org.au/
Apr 18-23 2005 The Australian Linux Technical Conference!

_______________________________________________
Kernel-janitors mailing list
[email protected]
http://lists.osdl.org/mailman/listinfo/kernel-janitors

author
#4 lore raw

cover remove concatenation with

In reply to Tony Breeds

--------------------------------------------------------------------------------

drivers/char/ftape/lowlevel/ftape-tracing.h +2 -2
diff -X dontdiff -purN 2.6.4.clean/drivers/char/ftape/lowlevel/ftape-tracing.h 2.6.4.kj_func/drivers/char/ftape/lowlevel/ftape-tracing.h
@@ -70,8 +70,8 @@ typedef enum {
 #define TRACE(l, m, i...)						\
 {									\
 	if ((ft_trace_t)(l) = FT_TRACE_TOP_LEVEL) {			\
-		printk(KERN_INFO"ftape"__FILE__"("__FUNCTION__"):\n"	\
-		       KERN_INFO m".\n" ,##i);				\
+		printk(KERN_INFO"ftape%s(%s):\n"	                \
+		       KERN_INFO m".\n" ,__FILE__, __FUNCTION__ , ##i);	\
 	}								\
 }
 #define SET_TRACE_LEVEL(l)      if ((l) = (l)) do {} while(0)
drivers/char/serial_tx3912.h +2 -2
diff -X dontdiff -purN 2.6.4.clean/drivers/char/serial_tx3912.h 2.6.4.kj_func/drivers/char/serial_tx3912.h
@@ -59,9 +59,9 @@ int rs_debug = TX3912_UART_DEBUG_ALL & ~
 
 #define rs_dprintk(f, str...) if (rs_debug & f) printk (str)
 #define func_enter() rs_dprintk (TX3912_UART_DEBUG_FLOW,	\
-				"rs: enter " __FUNCTION__ "\n")
+				"rs: enter %s\n", __FUNCTION__)
 #define func_exit() rs_dprintk (TX3912_UART_DEBUG_FLOW,	\
-				"rs: exit " __FUNCTION__ "\n")
+				"rs: exit %s\n", __FUNCTION__)
 
 #else
 #define rs_dprintk(f, str...)
drivers/char/watchdog/machzwd.c +1 -1
diff -X dontdiff -purN 2.6.4.clean/drivers/char/watchdog/machzwd.c 2.6.4.kj_func/drivers/char/watchdog/machzwd.c
@@ -151,7 +151,7 @@ static unsigned long next_heartbeat = 0;
 #ifndef ZF_DEBUG
 #	define dprintk(format, args...)
 #else
-#	define dprintk(format, args...) printk(KERN_DEBUG PFX; ":" __FUNCTION__ ":%d: " format, __LINE__ , ## args)
+#	define dprintk(format, args...) printk(KERN_DEBUG PFX ":%s:%d: " format, __FUNCTION__, __LINE__ , ## args)
 #endif
drivers/isdn/i4l/isdn_net.h +6 -6
diff -X dontdiff -purN 2.6.4.clean/drivers/isdn/i4l/isdn_net.h 2.6.4.kj_func/drivers/isdn/i4l/isdn_net.h
@@ -106,8 +106,8 @@ static __inline__ void isdn_net_add_to_b
 	spin_lock_irqsave(&nd->queue_lock, flags);
 
 	lp = nd->queue;
-//	printk(KERN_DEBUG __FUNCTION__": lp:%s(%p) nlp:%s(%p) last(%p)\n",
-//		lp->name, lp, nlp->name, nlp, lp->last); 
+//	printk(KERN_DEBUG "%s: lp:%s(%p) nlp:%s(%p) last(%p)\n",
+//		__FUNCTION__, lp->name, lp, nlp->name, nlp, lp->last); 
 	nlp->last = lp->last;
 	lp->last->next = nlp;
 	lp->last = nlp;

@@ -127,8 +127,8 @@ static __inline__ void isdn_net_rm_from_
 	if (lp->master)
 		master_lp = (isdn_net_local *) lp->master->priv;
 
-//	printk(KERN_DEBUG __FUNCTION__": lp:%s(%p) mlp:%s(%p) last(%p) next(%p) mndq(%p)\n",
-//		lp->name, lp, master_lp->name, master_lp, lp->last, lp->next, master_lp->netdev->queue); 
+//	printk(KERN_DEBUG "%s: lp:%s(%p) mlp:%s(%p) last(%p) next(%p) mndq(%p)\n",
+//		__FUNCTION__, lp->name, lp, master_lp->name, master_lp, lp->last, lp->next, master_lp->netdev->queue); 
 	spin_lock_irqsave(&master_lp->netdev->queue_lock, flags);
 	lp->last->next = lp->next;
 	lp->next->last = lp->last;

@@ -139,8 +139,8 @@ static __inline__ void isdn_net_rm_from_
 		}
 	}
 	lp->next = lp->last = lp;	/* (re)set own pointers */
-//	printk(KERN_DEBUG __FUNCTION__": mndq(%p)\n",
-//		master_lp->netdev->queue); 
+//	printk(KERN_DEBUG "%s: mndq(%p)\n",
+//		__FUNCTION__, master_lp->netdev->queue); 
 	spin_unlock_irqrestore(&master_lp->netdev->queue_lock, flags);
 }
drivers/media/video/w9966.c +1 -1
diff -X dontdiff -purN 2.6.4.clean/drivers/media/video/w9966.c 2.6.4.kj_func/drivers/media/video/w9966.c
@@ -63,7 +63,7 @@
 //#define DEBUG				// Undef me for production
 
 #ifdef DEBUG
-#define DPRINTF(x, a...) printk(KERN_DEBUG "W9966: "__FUNCTION__ "(): "x, ##a)
+#define DPRINTF(x, a...) printk(KERN_DEBUG "W9966: %s(): "x, __FUNCTION__ , ##a)
 #else
 #define DPRINTF(x...)
 #endif
drivers/mtd/chips/cfi_cmdset_0001.c +1 -1
diff -X dontdiff -purN 2.6.4.clean/drivers/mtd/chips/cfi_cmdset_0001.c 2.6.4.kj_func/drivers/mtd/chips/cfi_cmdset_0001.c
@@ -1575,7 +1575,7 @@ static int cfi_intelext_lock(struct mtd_
 					ofs, len, DO_XXLOCK_ONEBLOCK_LOCK);
 	
 #ifdef DEBUG_LOCK_BITS
-	printk(KERN_DEBUG __FUNCTION__
+	printk(KERN_DEBUG 
 	       "%s: lock status after, ret=%d\n", __FUNCTION__, ret);
 	cfi_intelext_varsize_frob(mtd, do_printlockstatus_oneblock,
 				  ofs, len, 0);
drivers/net/gt96100eth.c +1 -1
diff -X dontdiff -purN 2.6.4.clean/drivers/net/gt96100eth.c 2.6.4.kj_func/drivers/net/gt96100eth.c
@@ -1212,7 +1212,7 @@ gt96100_rx(struct net_device *dev, u32 s
 		    cmdstat, nextOut);
 
 		if (cmdstat & (u32)rxOwn) {
-			//err(__FUNCTION__ ": device owns descriptor!\n");
+			//err("%s: device owns descriptor!\n", __FUNCTION__);
 			// DMA is not finished updating descriptor???
 			// Leave and come back later to pick-up where
 			// we left off.
drivers/net/irda/smsc-ircc2.c +3 -3
diff -X dontdiff -purN 2.6.4.clean/drivers/net/irda/smsc-ircc2.c 2.6.4.kj_func/drivers/net/irda/smsc-ircc2.c
@@ -1429,7 +1429,7 @@ static irqreturn_t smsc_ircc_interrupt(i
 	}
 
 	if (iir & IRCC_IIR_ACTIVE_FRAME) {
-		/*printk(KERN_WARNING __FUNCTION__ "(): Active Frame\n");*/
+		/*printk(KERN_WARNING "%s(): Active Frame\n", __FUNCTION__);*/
 	}
 
 	/* Enable interrupts again */

@@ -1995,7 +1995,7 @@ static int __init smsc_ircc_look_for_chi
 	while(address->cfg_base){
 		cfg_base = address->cfg_base;
 		
-		/*printk(KERN_WARNING __FUNCTION__ "(): probing: 0x%02x for: 0x%02x\n", cfg_base, address->type);*/
+		/*printk(KERN_WARNING "%s(): probing: 0x%02x for: 0x%02x\n", __FUNCTION__, cfg_base, address->type);*/
 		
 		if( address->type & SMSCSIO_TYPE_FDC){
 			type = "FDC";

@@ -2040,7 +2040,7 @@ static int __init smsc_superio_flat(cons
 	outb(SMSCSIOFLAT_UARTMODE0C_REG, cfgbase);
 	mode = inb(cfgbase+1);
 	
-	/*printk(KERN_WARNING __FUNCTION__ "(): mode: 0x%02x\n", mode);*/
+	/*printk(KERN_WARNING "%s(): mode: 0x%02x\n", __FUNCTION__, mode);*/
 	
 	if(!(mode & SMSCSIOFLAT_UART2MODE_VAL_IRDA))
 		WARNING("%s(): IrDA not enabled\n", __FUNCTION__);
drivers/net/irda/via-ircc.c +1 -1
diff -X dontdiff -purN 2.6.4.clean/drivers/net/irda/via-ircc.c 2.6.4.kj_func/drivers/net/irda/via-ircc.c
@@ -360,7 +360,7 @@ static __devinit int via_ircc_open(int i
 
 	/* Reserve the ioports that we need */
 	if (!request_region(self->io.fir_base, self->io.fir_ext, driver_name)) {
-//              WARNING(__FUNCTION__ "(), can't get iobase of 0x%03x\n",self->io.fir_base);
+//              WARNING("%s(), can't get iobase of 0x%03x\n", __FUNCTION__, self->io.fir_base);
 		err = -ENODEV;
 		goto err_out1;
 	}
drivers/net/wireless/orinoco.h +2 -2
diff -X dontdiff -purN 2.6.4.clean/drivers/net/wireless/orinoco.h 2.6.4.kj_func/drivers/net/wireless/orinoco.h
@@ -125,8 +125,8 @@ extern int orinoco_debug;
 #define DEBUG(n, args...) do { } while (0)
 #endif	/* ORINOCO_DEBUG */
 
-#define TRACE_ENTER(devname) DEBUG(2, "%s: -> " __FUNCTION__ "()\n", devname);
-#define TRACE_EXIT(devname)  DEBUG(2, "%s: <- " __FUNCTION__ "()\n", devname);
+#define TRACE_ENTER(devname) DEBUG(2, "%s: -> %s()\n", __FUNCTION__, devname);
+#define TRACE_EXIT(devname)  DEBUG(2, "%s: <- %s()\n", __FUNCTION__, devname);
 
 extern struct net_device *alloc_orinocodev(int sizeof_card,
 					   int (*hard_reset)(struct orinoco_private *));
drivers/pci/hotplug/pcihp_skeleton.c +5 -5
diff -X dontdiff -purN 2.6.4.clean/drivers/pci/hotplug/pcihp_skeleton.c 2.6.4.kj_func/drivers/pci/hotplug/pcihp_skeleton.c
@@ -224,7 +224,7 @@ static int get_power_status (struct hotp
 	if (slot = NULL)
 		return -ENODEV;
 	
-	dbg(__FUNCTION__" - physical_slot = %s\n", hotplug_slot->name);
+	dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name);
 
 	/*
 	 * Fill in logic to get the current power status of the specific

@@ -242,7 +242,7 @@ static int get_attention_status (struct 
 	if (slot = NULL)
 		return -ENODEV;
 	
-	dbg(__FUNCTION__" - physical_slot = %s\n", hotplug_slot->name);
+	dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name);
 
 	/*
 	 * Fill in logic to get the current attention status of the specific

@@ -260,7 +260,7 @@ static int get_latch_status (struct hotp
 	if (slot = NULL)
 		return -ENODEV;
 	
-	dbg(__FUNCTION__" - physical_slot = %s\n", hotplug_slot->name);
+	dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name);
 
 	/*
 	 * Fill in logic to get the current latch status of the specific

@@ -278,7 +278,7 @@ static int get_adapter_status (struct ho
 	if (slot = NULL)
 		return -ENODEV;
 	
-	dbg(__FUNCTION__" - physical_slot = %s\n", hotplug_slot->name);
+	dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name);
 
 	/*
 	 * Fill in logic to get the current adapter status of the specific

@@ -296,7 +296,7 @@ static void release_slots(struct hotplug
 	if (slot = NULL)
 		return -ENODEV;
 
-	dbg(__FUNCTION__" - physical_slot = %s\n", hotplug_slot->name);
+	dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name);
 	kfree(slot->hotplug_slot->info);
 	kfree(slot->hotplug_slot->name);
 	kfree(slot->hotplug_slot);
drivers/pcmcia/sa1100_pfs168.c +1 -1
diff -X dontdiff -purN 2.6.4.clean/drivers/pcmcia/sa1100_pfs168.c 2.6.4.kj_func/drivers/pcmcia/sa1100_pfs168.c
@@ -101,7 +101,7 @@ pfs168_pcmcia_configure_socket(struct sa
     }
 
     if (state->Vpp != state->Vcc && state->Vpp != 0) {
-      printk(KERN_ERR "%s(): CompactFlash socket does not support VPP %uV\n"
+      printk(KERN_ERR "%s(): CompactFlash socket does not support VPP %uV\n",
 	     __FUNCTION__, state->Vpp / 10);
       return -1;
     }
drivers/pcmcia/sa1100_shannon.c +5 -5
diff -X dontdiff -purN 2.6.4.clean/drivers/pcmcia/sa1100_shannon.c 2.6.4.kj_func/drivers/pcmcia/sa1100_shannon.c
@@ -74,19 +74,19 @@ shannon_pcmcia_configure_socket(struct s
 {
 	switch (state->Vcc) {
 	case 0:	/* power off */
-		printk(KERN_WARNING __FUNCTION__"(): CS asked for 0V, still applying 3.3V..\n");
+		printk(KERN_WARNING "%s(): CS asked for 0V, still applying 3.3V..\n", __FUNCTION__);
 		break;
 	case 50:
-		printk(KERN_WARNING __FUNCTION__"(): CS asked for 5V, applying 3.3V..\n");
+		printk(KERN_WARNING "%s(): CS asked for 5V, applying 3.3V..\n", __FUNCTION__);
 	case 33:
 		break;
 	default:
-		printk(KERN_ERR __FUNCTION__"(): unrecognized Vcc %u\n",
-		       state->Vcc);
+		printk(KERN_ERR _"%s(): unrecognized Vcc %u\n",
+		       __FUNCTION__, state->Vcc);
 		return -1;
 	}
 
-	printk(KERN_WARNING __FUNCTION__"(): Warning, Can't perform reset\n");
+	printk(KERN_WARNING "%s(): Warning, Can't perform reset\n", __FUNCTION__);
 	
 	/* Silently ignore Vpp, output enable, speaker enable. */
drivers/pcmcia/sa1100_stork.c +2 -2
diff -X dontdiff -purN 2.6.4.clean/drivers/pcmcia/sa1100_stork.c 2.6.4.kj_func/drivers/pcmcia/sa1100_stork.c
@@ -50,7 +50,7 @@ static void stork_pcmcia_hw_shutdown(str
 {
 	int i;
 
-        printk(__FUNCTION__ "\n");
+        printk("%s\n", __FUNCTION__);
 
         /* disable IRQs */
         sa11xx_free_irqs(skt, irqs, ARRAY_SIZE(irqs));

@@ -68,7 +68,7 @@ stork_pcmcia_socket_state(struct sa1100_
         unsigned long levels = GPLR;
 
 	if (debug > 1)
-		printk(__FUNCTION__ " GPLR=%x IRQ[1:0]=%x\n", levels,
+		printk("%s GPLR=%x IRQ[1:0]=%x\n", __FUNCTION__, levels,
 			(levels & (GPIO_STORK_PCMCIA_A_RDY|GPIO_STORK_PCMCIA_B_RDY)));
 
 	switch (skt->nr) {
drivers/pcmcia/sa1100_yopy.c +3 -3
diff -X dontdiff -purN 2.6.4.clean/drivers/pcmcia/sa1100_yopy.c 2.6.4.kj_func/drivers/pcmcia/sa1100_yopy.c
@@ -76,13 +76,13 @@ yopy_pcmcia_configure_socket(struct sa11
 		pcmcia_power(0);
 		break;
 	case 50:
-		printk(KERN_WARNING __FUNCTION__"(): CS asked for 5V, applying 3.3V..\n");
+		printk(KERN_WARNING "%s(): CS asked for 5V, applying 3.3V..\n", __FUNCTION__);
 	case 33:
 		pcmcia_power(1);
 		break;
 	default:
-		printk(KERN_ERR __FUNCTION__"(): unrecognized Vcc %u\n",
-		       state->Vcc);
+		printk(KERN_ERR "%s(): unrecognized Vcc %u\n",
+		       __FUNCTION__, state->Vcc);
 		return -1;
 	}
drivers/scsi/pcmcia/nsp_debug.c +1 -1
diff -X dontdiff -purN 2.6.4.clean/drivers/scsi/pcmcia/nsp_debug.c 2.6.4.kj_func/drivers/scsi/pcmcia/nsp_debug.c
@@ -90,7 +90,7 @@ static void print_commandk (unsigned cha
 	int i, s;
 	printk(KERN_DEBUG);
 	print_opcodek(command[0]);
-	/*printk(KERN_DEBUG __FUNCTION__ " ");*/
+	/*printk(KERN_DEBUG "%s ", __FUNCTION__);*/
 	if ((command[0] >> 5) = 6 ||
 	    (command[0] >> 5) = 7 ) {
 		s = 12; /* vender specific */
drivers/tc/lk201.c +1 -1
diff -X dontdiff -purN 2.6.4.clean/drivers/tc/lk201.c 2.6.4.kj_func/drivers/tc/lk201.c
@@ -74,7 +74,7 @@ static int __init lk201_reset(struct dec
 
 	for (i = 0; i < sizeof(lk201_reset_string); i++)
 		if (info->hook->poll_tx_char(info, lk201_reset_string[i])) {
-			printk(__FUNCTION__" transmit timeout\n");
+			printk("%s transmit timeout\n", __FUNCTION__);
 			return -EIO;
 		}
 	return 0;
drivers/tc/zs.c +4 -3
diff -X dontdiff -purN 2.6.4.clean/drivers/tc/zs.c 2.6.4.kj_func/drivers/tc/zs.c
@@ -1988,7 +1988,8 @@ unsigned int register_zs_hook(unsigned i
 	struct dec_serial *info = &zs_soft[channel];
 
 	if (info->hook) {
-		printk(__FUNCTION__": line %d has already a hook registered\n", channel);
+		printk("%s: line %d has already a hook registered\n",
+		       __FUNCTION__, channel);
 
 		return 0;
 	} else {

@@ -2015,8 +2016,8 @@ unsigned int unregister_zs_hook(unsigned
                 info->hook = NULL;
                 return 1;
         } else {
-                printk(__FUNCTION__": trying to unregister hook on line %d,"
-                       " but none is registered\n", channel);
+                printk("%s: trying to unregister hook on line %d,"
+                       " but none is registered\n", __FUNCTION__, channel);
                 return 0;
         }
 }
drivers/usb/serial/kobil_sct.c +1 -1
diff -X dontdiff -purN 2.6.4.clean/drivers/usb/serial/kobil_sct.c 2.6.4.kj_func/drivers/usb/serial/kobil_sct.c
@@ -503,7 +503,7 @@ static int kobil_write (struct usb_seria
 
 static int kobil_write_room (struct usb_serial_port *port)
 {
-	//dbg(__FUNCTION__ " - port %d", port->number);
+	//dbg("%s - port %d", __FUNCTION__, port->number);
 	return 8;
 }

--------------------------------------------------------------------------------
Yours Tony

linux.conf.au http://lca2005.linux.org.au/
Apr 18-23 2005 The Australian Linux Technical Conference!

_______________________________________________
Kernel-janitors mailing list
[email protected]
http://lists.osdl.org/mailman/listinfo/kernel-janitors

author
#5 lore raw

cover remove concatenation with

In reply to Tony Breeds

--------------------------------------------------------------------------------

include/linux/jbd.h +8 -8
diff -X dontdiff -purN 2.6.4.clean/include/linux/jbd.h 2.6.4.kj_func/include/linux/jbd.h
@@ -56,7 +56,7 @@ extern int journal_enable_debug;
 		if ((n) <= journal_enable_debug) {			\
 			printk (KERN_DEBUG "(%s, %d): %s: ",		\
 				__FILE__, __LINE__, __FUNCTION__);	\
-		  	printk (f, ## a);				\
+		  	printk (f , ## a);				\
 		}							\
 	} while (0)
 #else

@@ -279,9 +279,9 @@ void buffer_assertion_failure(struct buf
 			printk(KERN_ERR why);				     \
 		}							     \
 	} while (0)
-#define J_EXPECT(expr, why...)		__journal_expect(expr, ## why)
-#define J_EXPECT_BH(bh, expr, why...)	__journal_expect(expr, ## why)
-#define J_EXPECT_JH(jh, expr, why...)	__journal_expect(expr, ## why)
+#define J_EXPECT(expr, why...)		__journal_expect(expr , ## why)
+#define J_EXPECT_BH(bh, expr, why...)	__journal_expect(expr , ## why)
+#define J_EXPECT_JH(jh, expr, why...)	__journal_expect(expr , ## why)
 #endif
 
 enum jbd_state_bits {

@@ -1001,10 +1001,10 @@ extern int	cleanup_journal_tail(journal_
 /* Debugging code only: */
 
 #define jbd_ENOSYS() \
-do {								      \
-	printk (KERN_ERR "JBD unimplemented function " __FUNCTION__); \
-	current->state = TASK_UNINTERRUPTIBLE;			      \
-	schedule();						      \
+do {								           \
+	printk (KERN_ERR "JBD unimplemented function %s\n", __FUNCTION__); \
+	current->state = TASK_UNINTERRUPTIBLE;			           \
+	schedule();						           \
 } while (1)
 
 /*

--------------------------------------------------------------------------------
Yours Tony

linux.conf.au http://lca2005.linux.org.au/
Apr 18-23 2005 The Australian Linux Technical Conference!

_______________________________________________
Kernel-janitors mailing list
[email protected]
http://lists.osdl.org/mailman/listinfo/kernel-janitors

author
#6 lore raw

PATCH 4/5 remove concatenation with

In reply to Tony Breeds

--------------------------------------------------------------------------------

net/8021q/vlan.h +2 -2
diff -X dontdiff -purN 2.6.4.clean/net/8021q/vlan.h 2.6.4.kj_func/net/8021q/vlan.h
@@ -19,8 +19,8 @@ I never found it..and the problem seems 
 I'll bet they might prove useful again... --Ben
 
 
-#define VLAN_MEM_DBG(x, y, z) printk(VLAN_DBG __FUNCTION__ ":  "  x, y, z);
-#define VLAN_FMEM_DBG(x, y) printk(VLAN_DBG __FUNCTION__  ":  " x, y);
+#define VLAN_MEM_DBG(x, y, z) printk(VLAN_DBG "%s:  "  x, __FUNCTION__, y, z);
+#define VLAN_FMEM_DBG(x, y) printk(VLAN_DBG "%s:  " x, __FUNCTION__, y);
 */
 
 /* This way they don't do anything! */
net/8021q/vlanproc.c +1 -1
diff -X dontdiff -purN 2.6.4.clean/net/8021q/vlanproc.c 2.6.4.kj_func/net/8021q/vlanproc.c
@@ -220,7 +220,7 @@ int vlan_proc_rem_dev(struct net_device 
 	}
 
 #ifdef VLAN_DEBUG
-	printk(VLAN_DBG __FUNCTION__ ": dev: %p\n", vlandev);
+	printk(VLAN_DBG "%s: dev: %p\n", __FUNCTION__, vlandev);
 #endif
 
 	/** NOTE:  This will consume the memory pointed to by dent, it seems. */
net/ipv4/netfilter/ip_conntrack_irc.c +2 -2
diff -X dontdiff -purN 2.6.4.clean/net/ipv4/netfilter/ip_conntrack_irc.c 2.6.4.kj_func/net/ipv4/netfilter/ip_conntrack_irc.c
@@ -60,8 +60,8 @@ DECLARE_LOCK(ip_irc_lock);
 struct module *ip_conntrack_irc = THIS_MODULE;
 
 #if 0
-#define DEBUGP(format, args...) printk(KERN_DEBUG __FILE__ ":" __FUNCTION__ \
-					":" format, ## args)
+#define DEBUGP(format, args...) printk(KERN_DEBUG "%s:%s:" format, \
+                                       __FILE__, __FUNCTION__ , ## args)
 #else
 #define DEBUGP(format, args...)
 #endif
net/ipv4/netfilter/ip_conntrack_tftp.c +2 -2
diff -X dontdiff -purN 2.6.4.clean/net/ipv4/netfilter/ip_conntrack_tftp.c 2.6.4.kj_func/net/ipv4/netfilter/ip_conntrack_tftp.c
@@ -33,8 +33,8 @@ MODULE_PARM_DESC(ports, "port numbers of
 #endif
 
 #if 0
-#define DEBUGP(format, args...) printk(__FILE__ ":" __FUNCTION__ ": " \
-				       format, ## args)
+#define DEBUGP(format, args...) printk(KERN_DEBUG "%s:%s:" format, \
+                                       __FILE__, __FUNCTION__ , ## args)
 #else
 #define DEBUGP(format, args...)
 #endif
net/ipv4/netfilter/ip_nat_tftp.c +2 -2
diff -X dontdiff -purN 2.6.4.clean/net/ipv4/netfilter/ip_nat_tftp.c 2.6.4.kj_func/net/ipv4/netfilter/ip_nat_tftp.c
@@ -47,8 +47,8 @@ MODULE_PARM_DESC(ports, "port numbers of
 #endif
 
 #if 0
-#define DEBUGP(format, args...) printk(__FILE__ ":" __FUNCTION__ ": " \
-				       format, ## args)
+#define DEBUGP(format, args...) printk(KERN_DEBUG "%s:%s:" format, \
+                                       __FILE__, __FUNCTION__ , ## args)
 #else
 #define DEBUGP(format, args...)
 #endif
net/ipv4/netfilter/ipt_ULOG.c +3 -3
diff -X dontdiff -purN 2.6.4.clean/net/ipv4/netfilter/ipt_ULOG.c 2.6.4.kj_func/net/ipv4/netfilter/ipt_ULOG.c
@@ -64,13 +64,13 @@ MODULE_DESCRIPTION("iptables userspace l
 #define ULOG_MAXNLGROUPS	32		/* numer of nlgroups */
 
 #if 0
-#define DEBUGP(format, args...)	printk(__FILE__ ":" __FUNCTION__ ":" \
-				       format, ## args)
+#define DEBUGP(format, args...) printk(KERN_DEBUG "%s:%s:" format, \
+                                       __FILE__, __FUNCTION__ , ## args)
 #else
 #define DEBUGP(format, args...)
 #endif
 
-#define PRINTR(format, args...) do { if (net_ratelimit()) printk(format, ## args); } while (0)
+#define PRINTR(format, args...) do { if (net_ratelimit()) printk(format , ## args); } while (0)
 
 static unsigned int nlbufsiz = 4096;
 MODULE_PARM(nlbufsiz, "i");

--------------------------------------------------------------------------------
Yours Tony

linux.conf.au http://lca2005.linux.org.au/
Apr 18-23 2005 The Australian Linux Technical Conference!

_______________________________________________
Kernel-janitors mailing list
[email protected]
http://lists.osdl.org/mailman/listinfo/kernel-janitors

author
#7 lore raw

PATCH 5/5 remove concatenation with

In reply to Tony Breeds

--------------------------------------------------------------------------------

sound/oss/au1000.c +6 -6
diff -X dontdiff -purN 2.6.4.clean/sound/oss/au1000.c 2.6.4.kj_func/sound/oss/au1000.c
@@ -369,7 +369,7 @@ static void set_adc_rate(struct au1000_s
 	adc_rate = rdcodec(s->codec, AC97_PCM_LR_ADC_RATE);
 
 #ifdef AU1000_VERBOSE_DEBUG
-	dbg(__FUNCTION__ ": set to %d Hz", adc_rate);
+	dbg("%s: set to %d Hz", __FUNCTION__, adc_rate);
 #endif
 
 	// some codec's don't allow unequal DAC and ADC rates, in which case

@@ -420,7 +420,7 @@ static void set_dac_rate(struct au1000_s
 	dac_rate = rdcodec(s->codec, AC97_PCM_FRONT_DAC_RATE);
 
 #ifdef AU1000_VERBOSE_DEBUG
-	dbg(__FUNCTION__ ": set to %d Hz", dac_rate);
+	dbg("%s: set to %d Hz", __FUNCTION__, dac_rate);
 #endif
 
 	// some codec's don't allow unequal DAC and ADC rates, in which case

@@ -989,7 +989,7 @@ static int translate_from_user(struct dm
 	for (sample = 0; sample < num_samples; sample++) {
 		if (copy_from_user(usersample, userbuf,
 				   db->user_bytes_per_sample)) {
-			dbg(__FUNCTION__ ": fault");
+			dbg("%s: fault", __FUNCTION__);
 			return -EFAULT;
 		}
 

@@ -1053,7 +1053,7 @@ static int translate_to_user(struct dmab
 
 		if (copy_to_user(userbuf, usersample,
 				 db->user_bytes_per_sample)) {
-			dbg(__FUNCTION__ ": fault");
+			dbg("%s: fault", __FUNCTION__);
 			return -EFAULT;
 		}
 

@@ -1848,9 +1848,9 @@ static int  au1000_open(struct inode *in
 
 #ifdef AU1000_VERBOSE_DEBUG
 	if (file->f_flags & O_NONBLOCK)
-		dbg(__FUNCTION__ ": non-blocking");
+		dbg("%s: non-blocking", __FUNCTION__);
 	else
-		dbg(__FUNCTION__ ": blocking");
+		dbg("%s: blocking", __FUNCTION__);
 #endif
 	
 	file->private_data = s;
sound/oss/ite8172.c +2 -2
diff -X dontdiff -purN 2.6.4.clean/sound/oss/ite8172.c 2.6.4.kj_func/sound/oss/ite8172.c
@@ -1779,9 +1779,9 @@ static int it8172_open(struct inode *ino
     
 #ifdef IT8172_VERBOSE_DEBUG
 	if (file->f_flags & O_NONBLOCK)
-		dbg(__FUNCTION__ ": non-blocking");
+		dbg("%s: non-blocking", __FUNCTION__);
 	else
-		dbg(__FUNCTION__ ": blocking");
+		dbg("%s: blocking", __FUNCTION__);
 #endif
 	
 	for (list = devs.next; ; list = list->next) {
sound/oss/rme96xx.c +3 -3
diff -X dontdiff -purN 2.6.4.clean/sound/oss/rme96xx.c 2.6.4.kj_func/sound/oss/rme96xx.c
@@ -872,7 +872,7 @@ int rme96xx_init(rme96xx_info* s)
 	int status;
 	unsigned short rev;
 
-	DBG(printk(__FUNCTION__"\n"));
+	DBG(printk("%s\n", __FUNCTION__));
 	numcards++;
 
 	s->magic = RME96xx_MAGIC; 

@@ -972,7 +972,7 @@ static int __devinit rme96xx_probe(struc
 	int i;
 	rme96xx_info *s;
 
-	DBG(printk(__FUNCTION__"\n"));
+	DBG(printk("%s\n", __FUNCTION__));
 	
 	if (pcidev->irq = 0) 
 		return -1;

@@ -1501,7 +1501,7 @@ static int rme96xx_release(struct inode 
 {
 	struct dmabuf * dma = (struct dmabuf*) file->private_data;
 	/* int hwp;  ... was unused   HP20020201 */
-	DBG(printk(__FUNCTION__"\n"));
+	DBG(printk("%s\n", __FUNCTION__));
 
 	COMM          ("draining")
 	if (dma->open_mode & FMODE_WRITE) {
sound/oss/trix_boot.h +2 -0
diff -X dontdiff -purN 2.6.4.clean/sound/oss/trix_boot.h 2.6.4.kj_func/sound/oss/trix_boot.h
@@ -0,0 +1,2 @@
+static unsigned char * trix_boot = NULL;
+static int trix_boot_len = 0;
sound/oss/vwsnd.c +6 -6
diff -X dontdiff -purN 2.6.4.clean/sound/oss/vwsnd.c 2.6.4.kj_func/sound/oss/vwsnd.c
@@ -195,14 +195,14 @@ static void dbgassert(const char *fcn, i
 
 #define ASSERT(e)      ((e) ? (void) 0 : dbgassert(__FUNCTION__, __LINE__, #e))
 #define DBGDO(x)            x
-#define DBGX(fmt, args...)  (in_interrupt() ? 0 : printk(KERN_ERR fmt, ##args))
-#define DBGP(fmt, args...)  (DBGX(__FUNCTION__ ": " fmt, ##args))
-#define DBGE(fmt, args...)  (DBGX(__FUNCTION__ fmt, ##args))
+#define DBGX(fmt, args...)  (in_interrupt() ? 0 : printk(KERN_ERR fmt , ##args))
+#define DBGP(fmt, args...)  (DBGX("%s: " fmt, __FUNCTION__ , ##args))
+#define DBGE(fmt, args...)  (DBGX("%s" fmt, __FUNCTION__ , ##args))
 #define DBGC(rtn)           (DBGP("calling %s\n", rtn))
 #define DBGR()              (DBGP("returning\n"))
-#define DBGXV(fmt, args...) (shut_up ? 0 : DBGX(fmt, ##args))
-#define DBGPV(fmt, args...) (shut_up ? 0 : DBGP(fmt, ##args))
-#define DBGEV(fmt, args...) (shut_up ? 0 : DBGE(fmt, ##args))
+#define DBGXV(fmt, args...) (shut_up ? 0 : DBGX(fmt , ##args))
+#define DBGPV(fmt, args...) (shut_up ? 0 : DBGP(fmt , ##args))
+#define DBGEV(fmt, args...) (shut_up ? 0 : DBGE(fmt , ##args))
 #define DBGCV(rtn)          (shut_up ? 0 : DBGC(rtn))
 #define DBGRV()             (shut_up ? 0 : DBGR())

--------------------------------------------------------------------------------

Yours Tony

linux.conf.au http://lca2005.linux.org.au/
Apr 18-23 2005 The Australian Linux Technical Conference!

_______________________________________________
Kernel-janitors mailing list
[email protected]
http://lists.osdl.org/mailman/listinfo/kernel-janitors

#8 lore raw

Re: [Kernel-janitors] [PATCH 5/5] remove concatenation with

In reply to Tony Breeds

Hi,

1. What's this trix_boot.h file in here for?

On Sat, 27 Mar 2004 13:17:05 +0800 Tony Breeds wrote:

| diff -X dontdiff -purN 2.6.4.clean/sound/oss/trix_boot.h 2.6.4.kj_func/sound/oss/trix_boot.h
| --- 2.6.4.clean/sound/oss/trix_boot.h	1970-01-01 10:00:00.000000000 +1000
| +++ 2.6.4.kj_func/sound/oss/trix_boot.h	2004-03-26 14:32:44.000000000 +1100
| @@ -0,0 +1,2 @@
| +static unsigned char * trix_boot = NULL;
| +static int trix_boot_len = 0;
| diff -X dontdiff -purN 2.6.4.clean/sound/oss/vwsnd.c 2.6.4.kj_func/sound/oss/vwsnd.c
| --- 2.6.4.clean/sound/oss/vwsnd.c	2004-01-18 17:51:36.000000000 +1100
| +++ 2.6.4.kj_func/sound/oss/vwsnd.c	2004-03-26 14:39:46.000000000 +1100
| @@ -195,14 +195,14 @@ static void dbgassert(const char *fcn, i
|  
|  #define ASSERT(e)      ((e) ? (void) 0 : dbgassert(__FUNCTION__, __LINE__, #e))
|  #define DBGDO(x)            x
| -#define DBGX(fmt, args...)  (in_interrupt() ? 0 : printk(KERN_ERR fmt, ##args))
| -#define DBGP(fmt, args...)  (DBGX(__FUNCTION__ ": " fmt, ##args))
| -#define DBGE(fmt, args...)  (DBGX(__FUNCTION__ fmt, ##args))
| +#define DBGX(fmt, args...)  (in_interrupt() ? 0 : printk(KERN_ERR fmt , ##args))
| +#define DBGP(fmt, args...)  (DBGX("%s: " fmt, __FUNCTION__ , ##args))
| +#define DBGE(fmt, args...)  (DBGX("%s" fmt, __FUNCTION__ , ##args))
|  #define DBGC(rtn)           (DBGP("calling %s\n", rtn))
|  #define DBGR()              (DBGP("returning\n"))
| -#define DBGXV(fmt, args...) (shut_up ? 0 : DBGX(fmt, ##args))
| -#define DBGPV(fmt, args...) (shut_up ? 0 : DBGP(fmt, ##args))
| -#define DBGEV(fmt, args...) (shut_up ? 0 : DBGE(fmt, ##args))
| +#define DBGXV(fmt, args...) (shut_up ? 0 : DBGX(fmt , ##args))
| +#define DBGPV(fmt, args...) (shut_up ? 0 : DBGP(fmt , ##args))
| +#define DBGEV(fmt, args...) (shut_up ? 0 : DBGE(fmt , ##args))

2. Some of these aren't related to $SUBJECT (__FUNCTION__), but are correct IIRC (for some versions of gcc). Can someone confirm that?

3. In a few cases, I noticed the addition of KERN_xyz levels to printk() calls. These are also not related to $SUBJECT so they should be separate patches. Furthermore, addition of a KERN_level removes the ability to use the "default console log level" since that applies only if the message doesn't have a log level, and the author might actually want to use a default log level instead of specifying one.

--
~Randy
(Again. Sometimes I think ln -s /usr/src/linux/.config .signature)
_______________________________________________
Kernel-janitors mailing list [email protected]
http://lists.osdl.org/mailman/listinfo/kernel-janitors

author
#9 lore raw

Re: [Kernel-janitors] [PATCH 5/5] remove concatenation with

In reply to Tony Breeds
Quoted 3 lines · Randy.Dunlap

Hi,

1. What's this trix_boot.h file in here for?

It;s an artifact fromt he build process that didn't get excluded in my dontdiff file and that I forgot to purge from the diff. Sorry.

Quoted 2 lines

2. Some of these aren't related to $SUBJECT (__FUNCTION__), but are correct IIRC (for some versions of gcc). Can someone confirm that?

Arnd Bergmann poited them out to me so while I was in these files I also fixed those problems. I can happily remove them and submitt if it's better. Actually I see that I have some rather bad whitespace inconsistancies (mostly in the arch patch). I'll fix them and retrans (take3)

Quoted 7 lines

3. In a few cases, I noticed the addition of KERN_xyz levels to printk() calls. These are also not related to $SUBJECT so they should be separate patches. Furthermore, addition of a KERN_level removes the ability to use the "default console log level" since that applies only if the message doesn't have a log level, and the author might actually want to use a default log level instead of specifying one.

It was a bug, I deliberatly chose not to add KERN_xyz's to this patchser for the reasons above, but then I assumes that all the iptables DEBUGP marorc where ther same (which they are apart from the KERN_DEBUG in ip_conntrack_irc.c) So I copied and pasted that change therby added inadvertabtly the KERN_DEBUG to the DEBUGP macro in the other files.

I'll definatly fix that in my take3. Give the total size of the patches is <34k, should I keep them split or combine them into one patch?

I'll wait to get and answer to Randy's second question before sending the 3rd attempt.

Yours Tony

linux.conf.au http://lca2005.linux.org.au/
Apr 18-23 2005 The Australian Linux Technical Conference!

_______________________________________________
Kernel-janitors mailing list
[email protected]
http://lists.osdl.org/mailman/listinfo/kernel-janitors

#10 lore raw

Re: [Kernel-janitors] [PATCH 5/5] remove concatenation with

In reply to Tony Breeds

On Fri, 2 Apr 2004 06:24:43 +0800 Tony Breeds wrote:

| On Thu, Apr 01, 2004 at 01:55:31PM -0800, Randy.Dunlap wrote:
| > Hi,
| > 
| > 1.  What's this trix_boot.h file in here for?
| 
| It;s an artifact fromt he build process that didn't get excluded in my
| dontdiff file and that I forgot to purge from the diff.  Sorry.

It does seem to be needed, though. Doesn't it?

| > 2.  Some of these aren't related to $SUBJECT (__FUNCTION__), but are
| > correct IIRC (for some versions of gcc).  Can someone confirm that?
| 
| Arnd Bergmann poited them out to me so while I was in these files I also
| fixed those problems.  I can happily remove them and submitt if it's
| better.  Actually I see that I have some rather bad whitespace
| inconsistancies (mostly in the arch patch).  I'll fix them and retrans
| (take3)
|  
| > 3.  In a few cases, I noticed the addition of KERN_xyz levels to
| > printk() calls.  These are also not related to $SUBJECT so they
| > should be separate patches.  Furthermore, addition of a KERN_level
| > removes the ability to use the "default console log level" since
| > that applies only if the message doesn't have a log level, and
| > the author might actually want to use a default log level instead
| > of specifying one.
| 
| It was a bug, I deliberatly chose not to add KERN_xyz's to this patchser
| for the reasons above, but then I assumes that all the iptables DEBUGP
| marorc where ther same (which they are apart from the KERN_DEBUG in
| ip_conntrack_irc.c)  So I copied and pasted that change therby added
| inadvertabtly the KERN_DEBUG to the DEBUGP macro in the other files.
| 
| I'll definatly fix that in my take3.  Give the total size of the patches
| is <34k, should I keep them split or combine them into one patch?

Keep them split up, please.

| I'll wait to get and answer to Randy's second question before sending | the 3rd attempt.

Thanks,
--
~Randy
_______________________________________________
Kernel-janitors mailing list
[email protected]
http://lists.osdl.org/mailman/listinfo/kernel-janitors

#11 lore raw

Re: [Kernel-janitors] [PATCH 5/5] remove concatenation with

In reply to Tony Breeds

On Thu, 1 Apr 2004 15:00:53 -0800 Randy.Dunlap wrote:

| On Fri, 2 Apr 2004 06:24:43 +0800 Tony Breeds wrote:
| 
| | On Thu, Apr 01, 2004 at 01:55:31PM -0800, Randy.Dunlap wrote:
| | > Hi,
| | > 
| | > 1.  What's this trix_boot.h file in here for?
| | 
| | It;s an artifact fromt he build process that didn't get excluded in my
| | dontdiff file and that I forgot to purge from the diff.  Sorry.
| 
| It does seem to be needed, though.  Doesn't it?

Nope, it's generated by the build system...

--
~Randy
(Again. Sometimes I think ln -s /usr/src/linux/.config .signature)
_______________________________________________
Kernel-janitors mailing list [email protected]
http://lists.osdl.org/mailman/listinfo/kernel-janitors

author
#12 lore raw

Re: [Kernel-janitors] [PATCH 5/5] remove concatenation with

In reply to Tony Breeds
Quoted 2 lines · Randy.Dunlap

2. Some of these aren't related to $SUBJECT (__FUNCTION__), but are correct IIRC (for some versions of gcc). Can someone confirm that?

By way of a followup see:
http://marc.theaimsgroup.com/?l=linux-kernel&m8060877327415

I think from my point of view the best way to handle this would be, ignore the varargs issue unless I'm already editing a statement that contains the bug (or I created the bug myself).

Then if it is desirable to fix all the places where gcc-2.95 has problems with varargs I can generate a separate patch for that.

Yours Tony

linux.conf.au http://lca2005.linux.org.au/
Apr 18-23 2005 The Australian Linux Technical Conference!

_______________________________________________
Kernel-janitors mailing list
[email protected]
http://lists.osdl.org/mailman/listinfo/kernel-janitors

#13 lore raw

Re: [Kernel-janitors] [PATCH 5/5] remove concatenation with

In reply to Tony Breeds

On Sun, 4 Apr 2004 10:20:19 +0800 Tony Breeds <[email protected]> wrote:

| On Thu, Apr 01, 2004 at 01:55:31PM -0800, Randy.Dunlap wrote:
|  
| > 2.  Some of these aren't related to $SUBJECT (__FUNCTION__), but are
| > correct IIRC (for some versions of gcc).  Can someone confirm that?
| 
| By way of a followup see:
| http://marc.theaimsgroup.com/?l=linux-kernel&m8060877327415
| 
| I think from my point of view the best way to handle this would be,
| ignore the varargs issue unless I'm already editing a statement that
| contains the bug (or I created the bug myself).
| 
| Then if it is desirable to fix all the places where gcc-2.95 has
| problems with varargs I can generate a separate patch for that.

Yes, that sounds good.

Thanks,
--
~Randy
_______________________________________________
Kernel-janitors mailing list
[email protected]
http://lists.osdl.org/mailman/listinfo/kernel-janitors

author
#14 lore raw

PATCH 1/5 remove concatenation with

In reply to Tony Breeds
arch/arm/mach-sa1100/h3600.c +7 -7
diff -X dontdiff -purN 2.6.5-rc3.clean/arch/arm/mach-sa1100/h3600.c 2.6.5-rc3.kj_func/arch/arm/mach-sa1100/h3600.c
@@ -481,7 +481,7 @@ static void h3800_control_egpio(enum ipa
 	case IPAQ_EGPIO_CODEC_NRESET:
 	case IPAQ_EGPIO_AUDIO_ON:
 	case IPAQ_EGPIO_QMUTE:
-		printk(__FUNCTION__ ": error - should not be called\n");
+		printk("%s: error - should not be called\n", __FUNCTION__);
 		break;
 	case IPAQ_EGPIO_OPT_NVRAM_ON:
 		SET_ASIC2(GPIO2_OPT_ON_NVRAM);

@@ -523,7 +523,7 @@ static int h3800_pm_callback(int req)
 	static u16 asic2_data;
 	int result = 0;
 
-	printk(__FUNCTION__ " %d\n", req);
+	printk("%s %d\n", __FUNCTION__, req);
 
 	switch (req) {
 	case PM_RESUME:

@@ -551,7 +551,7 @@ static int h3800_pm_callback(int req)
 		asic2_data = H3800_ASIC2_GPIOPIOD;
 		break;
 	default:
-		printk(__FUNCTION__ ": unrecognized PM callback\n");
+		printk("%s: unrecognized PM callback\n", __FUNCTION__);
 		break;
 	}
 	return result;

@@ -591,7 +591,7 @@ static void h3800_IRQ_demux(unsigned int
 {
 	int i;
 
-	if (0) printk(__FUNCTION__ ": interrupt received\n");
+	if (0) printk("%s: interrupt received\n", __FUNCTION__);
 
 	desc->chip->ack(irq);
 

@@ -601,21 +601,21 @@ static void h3800_IRQ_demux(unsigned int
 
 		/* KPIO */
 		irq = H3800_ASIC2_KPIINTFLAG;
-		if (0) printk(__FUNCTION__" KPIO 0x%08X\n", irq);
+		if (0) printk("%s KPIO 0x%08X\n", __FUNCTION__, irq);
 		for (j = 0; j < H3800_KPIO_IRQ_COUNT; j++)
 			if (irq & kpio_irq_mask[j])
 				do_edge_IRQ(H3800_KPIO_IRQ_COUNT + j, irq_desc + H3800_KPIO_IRQ_COUNT + j, regs);
 
 		/* GPIO2 */
 		irq = H3800_ASIC2_GPIINTFLAG;
-		if (0) printk(__FUNCTION__" GPIO 0x%08X\n", irq);
+		if (0) printk("%s GPIO 0x%08X\n", __FUNCTION__, irq);
 		for (j = 0; j < H3800_GPIO_IRQ_COUNT; j++)
 			if (irq & gpio_irq_mask[j])
 				do_edge_IRQ(H3800_GPIO_IRQ_COUNT + j, irq_desc + H3800_GPIO_IRQ_COUNT + j , regs);
 	}
 
 	if (i >= MAX_ASIC_ISR_LOOPS)
-		printk(__FUNCTION__ ": interrupt processing overrun\n");
+		printk("%s: interrupt processing overrun\n", __FUNCTION__);
 
 	/* For level-based interrupts */
 	desc->chip->unmask(irq);
arch/mips/au1000/common/usbdev.c +16 -16
diff -X dontdiff -purN 2.6.5-rc3.clean/arch/mips/au1000/common/usbdev.c 2.6.5-rc3.kj_func/arch/mips/au1000/common/usbdev.c
@@ -199,12 +199,12 @@ get_std_req_name(int req)
 static void
 dump_setup(struct usb_ctrlrequest* s)
 {
-	dbg(__FUNCTION__ ": requesttype=%d", s->requesttype);
-	dbg(__FUNCTION__ ": request=%d %s", s->request,
+	dbg("%s: requesttype=%d", __FUNCTION__, s->requesttype);
+	dbg("%s: request=%d %s", __FUNCTION__, s->request,
 	    get_std_req_name(s->request));
-	dbg(__FUNCTION__ ": value=0x%04x", s->wValue);
-	dbg(__FUNCTION__ ": index=%d", s->index);
-	dbg(__FUNCTION__ ": length=%d", s->length);
+	dbg("%s: value=0x%04x", __FUNCTION__, s->wValue);
+	dbg("%s: index=%d", __FUNCTION__, s->index);
+	dbg("%s: length=%d", __FUNCTION__, s->length);
 }
 #endif
 

@@ -436,10 +436,10 @@ kickstart_send_packet(endpoint_t * ep)
 	u32 cs;
 	usbdev_pkt_t *pkt = ep->inlist.head;
 
-	vdbg(__FUNCTION__ ": ep%d, pkt=%p", ep->address, pkt);
+	vdbg("%s: ep%d, pkt=%p", __FUNCTION__, ep->address, pkt);
 
 	if (!pkt) {
-		err(__FUNCTION__ ": head=NULL! list->count=%d",
+		err("%s: head=NULL! list->count=%d", __FUNCTION__,
 		    ep->inlist.count);
 		return;
 	}

@@ -484,7 +484,7 @@ send_packet_complete(endpoint_t * ep)
 			(au_readl(ep->reg->ctrl_stat) & USBDEV_CS_NAK) ?
 			PKT_STATUS_NAK : PKT_STATUS_ACK;
 
-		vdbg(__FUNCTION__ ": ep%d, %s pkt=%p, list count=%d",
+		vdbg("%s: ep%d, %s pkt=%p, list count=%d", __FUNCTION__,
 		     ep->address, (pkt->status & PKT_STATUS_NAK) ?
 		     "NAK" : "ACK", pkt, ep->inlist.count);
 	}

@@ -529,7 +529,7 @@ send_packet(struct usb_dev* dev, usbdev_
 
 	link_tail(ep, list, pkt);
 
-	vdbg(__FUNCTION__ ": ep%d, pkt=%p, size=%d, list count=%d",
+	vdbg("%s: ep%d, pkt=%p, size=%d, list count=%d", __FUNCTION__, 
 	     ep->address, pkt, pkt->size, list->count);
 
 	if (list->count = 1) {

@@ -555,7 +555,7 @@ kickstart_receive_packet(endpoint_t * ep
 
 	// get and link a new packet for next reception
 	if (!(pkt = add_packet(ep, &ep->outlist, ep->max_pkt_size))) {
-		err(__FUNCTION__ ": could not alloc new packet");
+		err("%s: could not alloc new packet", __FUNCTION__);
 		return;
 	}
 

@@ -615,7 +615,7 @@ receive_packet_complete(endpoint_t * ep)
 	if (ep->address = 0 && (cs & USBDEV_CS_SU))
 		pkt->status |= PKT_STATUS_SU;
 
-	vdbg(__FUNCTION__ ": ep%d, %s pkt=%p, size=%d",
+	vdbg("%s: ep%d, %s pkt=%p, size=%d", __FUNCTION__,
 	     ep->address, (pkt->status & PKT_STATUS_NAK) ?
 	     "NAK" : "ACK", pkt, pkt->size);
 

@@ -719,7 +719,7 @@ do_set_address(struct usb_dev* dev, stru
 	int new_state = dev->state;
 	int new_addr = le16_to_cpu(setup->wValue);
 
-	dbg(__FUNCTION__ ": our address=%d", new_addr);
+	dbg("%s: our address=%d", __FUNCTION__, new_addr);
 
 	if (new_addr > 127) {
 			// usb spec doesn't tell us what to do, so just go to

@@ -918,18 +918,18 @@ do_setup (struct usb_dev* dev, struct us
 {
 	req_method_t m;
 
-	dbg(__FUNCTION__ ": req %d %s", setup->bRequestType,
+	dbg("%s: req %d %s", __FUNCTION__, setup->bRequestType,
 	    get_std_req_name(setup->bRequestType));
 
 	if ((setup->bRequestType & USB_TYPE_MASK) != USB_TYPE_STANDARD ||
 	    (setup->bRequestType & USB_RECIP_MASK) != USB_RECIP_DEVICE) {
-		err(__FUNCTION__ ": invalid requesttype 0x%02x",
+		err("%s: invalid requesttype 0x%02x", __FUNCTION__,
 		    setup->bRequestType);
 		return;
 		}
 
 	if ((setup->bRequestType & 0x80) = USB_DIR_OUT && setup->wLength)
-		dbg(__FUNCTION__ ": OUT phase! length=%d", setup->wLength);
+		dbg("%s: OUT phase! length=%d", __FUNCTION__, setup->wLength);
 
 	if (setup->bRequestType < sizeof(req_method)/sizeof(req_method_t))
 		m = req_method[setup->bRequestType];

@@ -980,7 +980,7 @@ process_ep0_receive (struct usb_dev* dev
 #endif
 			do_setup(dev, (struct usb_ctrlrequest*)pkt->payload);
 		} else
-			err(__FUNCTION__ ": wrong size SETUP received");
+			err("%s: wrong size SETUP received", __FUNCTION__);
 		break;
 	case DATA_STAGE:
 		/*
arch/mips/mm-64/tlb-dbg-r4k.c +1 -1
diff -X dontdiff -purN 2.6.5-rc3.clean/arch/mips/mm-64/tlb-dbg-r4k.c 2.6.5-rc3.kj_func/arch/mips/mm-64/tlb-dbg-r4k.c
@@ -24,7 +24,7 @@ asmlinkage void do_page_fault(struct pt_
 asmlinkage void tlb_refill_debug(struct pt_regs regs)
 {
 	show_regs(&regs);
-	panic(__FUNCTION__ " called.  This Does Not Happen (TM).");
+	panic("%s called.  This Does Not Happen (TM).", __FUNCTION__);
 }
 
 asmlinkage void xtlb_refill_debug(struct pt_regs *regs)

_______________________________________________
Kernel-janitors mailing list
[email protected]
http://lists.osdl.org/mailman/listinfo/kernel-janitors

author
#15 lore raw

PATCH 2/5 remove concatenation with

In reply to Tony Breeds
drivers/char/ftape/lowlevel/ftape-tracing.h +2 -2
diff -X dontdiff -purN 2.6.5-rc3.clean/drivers/char/ftape/lowlevel/ftape-tracing.h 2.6.5-rc3.kj_func/drivers/char/ftape/lowlevel/ftape-tracing.h
@@ -70,8 +70,8 @@ typedef enum {
 #define TRACE(l, m, i...)						\
 {									\
 	if ((ft_trace_t)(l) = FT_TRACE_TOP_LEVEL) {			\
-		printk(KERN_INFO"ftape"__FILE__"("__FUNCTION__"):\n"	\
-		       KERN_INFO m".\n" ,##i);				\
+		printk(KERN_INFO"ftape%s(%s):\n"	                \
+		       KERN_INFO m".\n" ,__FILE__, __FUNCTION__ , ##i);	\
 	}								\
 }
 #define SET_TRACE_LEVEL(l)      if ((l) = (l)) do {} while(0)
drivers/char/serial_tx3912.h +2 -2
diff -X dontdiff -purN 2.6.5-rc3.clean/drivers/char/serial_tx3912.h 2.6.5-rc3.kj_func/drivers/char/serial_tx3912.h
@@ -59,9 +59,9 @@ int rs_debug = TX3912_UART_DEBUG_ALL & ~
 
 #define rs_dprintk(f, str...) if (rs_debug & f) printk (str)
 #define func_enter() rs_dprintk (TX3912_UART_DEBUG_FLOW,	\
-				"rs: enter " __FUNCTION__ "\n")
+				"rs: enter %s\n", __FUNCTION__)
 #define func_exit() rs_dprintk (TX3912_UART_DEBUG_FLOW,	\
-				"rs: exit " __FUNCTION__ "\n")
+				"rs: exit %s\n", __FUNCTION__)
 
 #else
 #define rs_dprintk(f, str...)
drivers/char/watchdog/machzwd.c +1 -1
diff -X dontdiff -purN 2.6.5-rc3.clean/drivers/char/watchdog/machzwd.c 2.6.5-rc3.kj_func/drivers/char/watchdog/machzwd.c
@@ -151,7 +151,7 @@ static unsigned long next_heartbeat = 0;
 #ifndef ZF_DEBUG
 #	define dprintk(format, args...)
 #else
-#	define dprintk(format, args...) printk(KERN_DEBUG PFX; ":" __FUNCTION__ ":%d: " format, __LINE__ , ## args)
+#	define dprintk(format, args...) printk(KERN_DEBUG PFX ":%s:%d: " format, __FUNCTION__, __LINE__ , ## args)
 #endif
drivers/isdn/i4l/isdn_net.h +6 -6
diff -X dontdiff -purN 2.6.5-rc3.clean/drivers/isdn/i4l/isdn_net.h 2.6.5-rc3.kj_func/drivers/isdn/i4l/isdn_net.h
@@ -106,8 +106,8 @@ static __inline__ void isdn_net_add_to_b
 	spin_lock_irqsave(&nd->queue_lock, flags);
 
 	lp = nd->queue;
-//	printk(KERN_DEBUG __FUNCTION__": lp:%s(%p) nlp:%s(%p) last(%p)\n",
-//		lp->name, lp, nlp->name, nlp, lp->last); 
+//	printk(KERN_DEBUG "%s: lp:%s(%p) nlp:%s(%p) last(%p)\n",
+//		__FUNCTION__, lp->name, lp, nlp->name, nlp, lp->last); 
 	nlp->last = lp->last;
 	lp->last->next = nlp;
 	lp->last = nlp;

@@ -127,8 +127,8 @@ static __inline__ void isdn_net_rm_from_
 	if (lp->master)
 		master_lp = (isdn_net_local *) lp->master->priv;
 
-//	printk(KERN_DEBUG __FUNCTION__": lp:%s(%p) mlp:%s(%p) last(%p) next(%p) mndq(%p)\n",
-//		lp->name, lp, master_lp->name, master_lp, lp->last, lp->next, master_lp->netdev->queue); 
+//	printk(KERN_DEBUG "%s: lp:%s(%p) mlp:%s(%p) last(%p) next(%p) mndq(%p)\n",
+//		__FUNCTION__, lp->name, lp, master_lp->name, master_lp, lp->last, lp->next, master_lp->netdev->queue); 
 	spin_lock_irqsave(&master_lp->netdev->queue_lock, flags);
 	lp->last->next = lp->next;
 	lp->next->last = lp->last;

@@ -139,8 +139,8 @@ static __inline__ void isdn_net_rm_from_
 		}
 	}
 	lp->next = lp->last = lp;	/* (re)set own pointers */
-//	printk(KERN_DEBUG __FUNCTION__": mndq(%p)\n",
-//		master_lp->netdev->queue); 
+//	printk(KERN_DEBUG "%s: mndq(%p)\n",
+//		__FUNCTION__, master_lp->netdev->queue); 
 	spin_unlock_irqrestore(&master_lp->netdev->queue_lock, flags);
 }
drivers/media/video/w9966.c +1 -1
diff -X dontdiff -purN 2.6.5-rc3.clean/drivers/media/video/w9966.c 2.6.5-rc3.kj_func/drivers/media/video/w9966.c
@@ -63,7 +63,7 @@
 //#define DEBUG				// Undef me for production
 
 #ifdef DEBUG
-#define DPRINTF(x, a...) printk(KERN_DEBUG "W9966: "__FUNCTION__ "(): "x, ##a)
+#define DPRINTF(x, a...) printk(KERN_DEBUG "W9966: %s(): "x, __FUNCTION__ , ##a)
 #else
 #define DPRINTF(x...)
 #endif
drivers/mtd/chips/cfi_cmdset_0001.c +1 -1
diff -X dontdiff -purN 2.6.5-rc3.clean/drivers/mtd/chips/cfi_cmdset_0001.c 2.6.5-rc3.kj_func/drivers/mtd/chips/cfi_cmdset_0001.c
@@ -1575,7 +1575,7 @@ static int cfi_intelext_lock(struct mtd_
 					ofs, len, DO_XXLOCK_ONEBLOCK_LOCK);
 	
 #ifdef DEBUG_LOCK_BITS
-	printk(KERN_DEBUG __FUNCTION__
+	printk(KERN_DEBUG 
 	       "%s: lock status after, ret=%d\n", __FUNCTION__, ret);
 	cfi_intelext_varsize_frob(mtd, do_printlockstatus_oneblock,
 				  ofs, len, 0);
drivers/net/gt96100eth.c +1 -1
diff -X dontdiff -purN 2.6.5-rc3.clean/drivers/net/gt96100eth.c 2.6.5-rc3.kj_func/drivers/net/gt96100eth.c
@@ -1212,7 +1212,7 @@ gt96100_rx(struct net_device *dev, u32 s
 		    cmdstat, nextOut);
 
 		if (cmdstat & (u32)rxOwn) {
-			//err(__FUNCTION__ ": device owns descriptor!\n");
+			//err("%s: device owns descriptor!\n", __FUNCTION__);
 			// DMA is not finished updating descriptor???
 			// Leave and come back later to pick-up where
 			// we left off.
drivers/net/irda/smsc-ircc2.c +3 -3
diff -X dontdiff -purN 2.6.5-rc3.clean/drivers/net/irda/smsc-ircc2.c 2.6.5-rc3.kj_func/drivers/net/irda/smsc-ircc2.c
@@ -1429,7 +1429,7 @@ static irqreturn_t smsc_ircc_interrupt(i
 	}
 
 	if (iir & IRCC_IIR_ACTIVE_FRAME) {
-		/*printk(KERN_WARNING __FUNCTION__ "(): Active Frame\n");*/
+		/*printk(KERN_WARNING "%s(): Active Frame\n", __FUNCTION__);*/
 	}
 
 	/* Enable interrupts again */

@@ -1995,7 +1995,7 @@ static int __init smsc_ircc_look_for_chi
 	while(address->cfg_base){
 		cfg_base = address->cfg_base;
 		
-		/*printk(KERN_WARNING __FUNCTION__ "(): probing: 0x%02x for: 0x%02x\n", cfg_base, address->type);*/
+		/*printk(KERN_WARNING "%s(): probing: 0x%02x for: 0x%02x\n", __FUNCTION__, cfg_base, address->type);*/
 		
 		if( address->type & SMSCSIO_TYPE_FDC){
 			type = "FDC";

@@ -2040,7 +2040,7 @@ static int __init smsc_superio_flat(cons
 	outb(SMSCSIOFLAT_UARTMODE0C_REG, cfgbase);
 	mode = inb(cfgbase+1);
 	
-	/*printk(KERN_WARNING __FUNCTION__ "(): mode: 0x%02x\n", mode);*/
+	/*printk(KERN_WARNING "%s(): mode: 0x%02x\n", __FUNCTION__, mode);*/
 	
 	if(!(mode & SMSCSIOFLAT_UART2MODE_VAL_IRDA))
 		WARNING("%s(): IrDA not enabled\n", __FUNCTION__);
drivers/net/irda/via-ircc.c +1 -1
diff -X dontdiff -purN 2.6.5-rc3.clean/drivers/net/irda/via-ircc.c 2.6.5-rc3.kj_func/drivers/net/irda/via-ircc.c
@@ -360,7 +360,7 @@ static __devinit int via_ircc_open(int i
 
 	/* Reserve the ioports that we need */
 	if (!request_region(self->io.fir_base, self->io.fir_ext, driver_name)) {
-//              WARNING(__FUNCTION__ "(), can't get iobase of 0x%03x\n",self->io.fir_base);
+//              WARNING("%s(), can't get iobase of 0x%03x\n", __FUNCTION__, self->io.fir_base);
 		err = -ENODEV;
 		goto err_out1;
 	}
drivers/net/wireless/orinoco.h +2 -2
diff -X dontdiff -purN 2.6.5-rc3.clean/drivers/net/wireless/orinoco.h 2.6.5-rc3.kj_func/drivers/net/wireless/orinoco.h
@@ -125,8 +125,8 @@ extern int orinoco_debug;
 #define DEBUG(n, args...) do { } while (0)
 #endif	/* ORINOCO_DEBUG */
 
-#define TRACE_ENTER(devname) DEBUG(2, "%s: -> " __FUNCTION__ "()\n", devname);
-#define TRACE_EXIT(devname)  DEBUG(2, "%s: <- " __FUNCTION__ "()\n", devname);
+#define TRACE_ENTER(devname) DEBUG(2, "%s: -> %s()\n", __FUNCTION__, devname);
+#define TRACE_EXIT(devname)  DEBUG(2, "%s: <- %s()\n", __FUNCTION__, devname);
 
 extern struct net_device *alloc_orinocodev(int sizeof_card,
 					   int (*hard_reset)(struct orinoco_private *));
drivers/pci/hotplug/pcihp_skeleton.c +5 -5
diff -X dontdiff -purN 2.6.5-rc3.clean/drivers/pci/hotplug/pcihp_skeleton.c 2.6.5-rc3.kj_func/drivers/pci/hotplug/pcihp_skeleton.c
@@ -224,7 +224,7 @@ static int get_power_status (struct hotp
 	if (slot = NULL)
 		return -ENODEV;
 	
-	dbg(__FUNCTION__" - physical_slot = %s\n", hotplug_slot->name);
+	dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name);
 
 	/*
 	 * Fill in logic to get the current power status of the specific

@@ -242,7 +242,7 @@ static int get_attention_status (struct 
 	if (slot = NULL)
 		return -ENODEV;
 	
-	dbg(__FUNCTION__" - physical_slot = %s\n", hotplug_slot->name);
+	dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name);
 
 	/*
 	 * Fill in logic to get the current attention status of the specific

@@ -260,7 +260,7 @@ static int get_latch_status (struct hotp
 	if (slot = NULL)
 		return -ENODEV;
 	
-	dbg(__FUNCTION__" - physical_slot = %s\n", hotplug_slot->name);
+	dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name);
 
 	/*
 	 * Fill in logic to get the current latch status of the specific

@@ -278,7 +278,7 @@ static int get_adapter_status (struct ho
 	if (slot = NULL)
 		return -ENODEV;
 	
-	dbg(__FUNCTION__" - physical_slot = %s\n", hotplug_slot->name);
+	dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name);
 
 	/*
 	 * Fill in logic to get the current adapter status of the specific

@@ -296,7 +296,7 @@ static void release_slots(struct hotplug
 	if (slot = NULL)
 		return -ENODEV;
 
-	dbg(__FUNCTION__" - physical_slot = %s\n", hotplug_slot->name);
+	dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name);
 	kfree(slot->hotplug_slot->info);
 	kfree(slot->hotplug_slot->name);
 	kfree(slot->hotplug_slot);
drivers/pcmcia/sa1100_pfs168.c +1 -1
diff -X dontdiff -purN 2.6.5-rc3.clean/drivers/pcmcia/sa1100_pfs168.c 2.6.5-rc3.kj_func/drivers/pcmcia/sa1100_pfs168.c
@@ -101,7 +101,7 @@ pfs168_pcmcia_configure_socket(struct sa
     }
 
     if (state->Vpp != state->Vcc && state->Vpp != 0) {
-      printk(KERN_ERR "%s(): CompactFlash socket does not support VPP %uV\n"
+      printk(KERN_ERR "%s(): CompactFlash socket does not support VPP %uV\n",
 	     __FUNCTION__, state->Vpp / 10);
       return -1;
     }
drivers/pcmcia/sa1100_shannon.c +5 -5
diff -X dontdiff -purN 2.6.5-rc3.clean/drivers/pcmcia/sa1100_shannon.c 2.6.5-rc3.kj_func/drivers/pcmcia/sa1100_shannon.c
@@ -74,19 +74,19 @@ shannon_pcmcia_configure_socket(struct s
 {
 	switch (state->Vcc) {
 	case 0:	/* power off */
-		printk(KERN_WARNING __FUNCTION__"(): CS asked for 0V, still applying 3.3V..\n");
+		printk(KERN_WARNING "%s(): CS asked for 0V, still applying 3.3V..\n", __FUNCTION__);
 		break;
 	case 50:
-		printk(KERN_WARNING __FUNCTION__"(): CS asked for 5V, applying 3.3V..\n");
+		printk(KERN_WARNING "%s(): CS asked for 5V, applying 3.3V..\n", __FUNCTION__);
 	case 33:
 		break;
 	default:
-		printk(KERN_ERR __FUNCTION__"(): unrecognized Vcc %u\n",
-		       state->Vcc);
+		printk(KERN_ERR "%s(): unrecognized Vcc %u\n",
+		       __FUNCTION__, state->Vcc);
 		return -1;
 	}
 
-	printk(KERN_WARNING __FUNCTION__"(): Warning, Can't perform reset\n");
+	printk(KERN_WARNING "%s(): Warning, Can't perform reset\n", __FUNCTION__);
 	
 	/* Silently ignore Vpp, output enable, speaker enable. */
drivers/pcmcia/sa1100_stork.c +2 -2
diff -X dontdiff -purN 2.6.5-rc3.clean/drivers/pcmcia/sa1100_stork.c 2.6.5-rc3.kj_func/drivers/pcmcia/sa1100_stork.c
@@ -50,7 +50,7 @@ static void stork_pcmcia_hw_shutdown(str
 {
 	int i;
 
-        printk(__FUNCTION__ "\n");
+        printk("%s\n", __FUNCTION__);
 
         /* disable IRQs */
         sa11xx_free_irqs(skt, irqs, ARRAY_SIZE(irqs));

@@ -68,7 +68,7 @@ stork_pcmcia_socket_state(struct sa1100_
         unsigned long levels = GPLR;
 
 	if (debug > 1)
-		printk(__FUNCTION__ " GPLR=%x IRQ[1:0]=%x\n", levels,
+		printk("%s GPLR=%x IRQ[1:0]=%x\n", __FUNCTION__, levels,
 			(levels & (GPIO_STORK_PCMCIA_A_RDY|GPIO_STORK_PCMCIA_B_RDY)));
 
 	switch (skt->nr) {
drivers/pcmcia/sa1100_yopy.c +3 -3
diff -X dontdiff -purN 2.6.5-rc3.clean/drivers/pcmcia/sa1100_yopy.c 2.6.5-rc3.kj_func/drivers/pcmcia/sa1100_yopy.c
@@ -76,13 +76,13 @@ yopy_pcmcia_configure_socket(struct sa11
 		pcmcia_power(0);
 		break;
 	case 50:
-		printk(KERN_WARNING __FUNCTION__"(): CS asked for 5V, applying 3.3V..\n");
+		printk(KERN_WARNING "%s(): CS asked for 5V, applying 3.3V..\n", __FUNCTION__);
 	case 33:
 		pcmcia_power(1);
 		break;
 	default:
-		printk(KERN_ERR __FUNCTION__"(): unrecognized Vcc %u\n",
-		       state->Vcc);
+		printk(KERN_ERR "%s(): unrecognized Vcc %u\n",
+		       __FUNCTION__, state->Vcc);
 		return -1;
 	}
drivers/scsi/pcmcia/nsp_debug.c +1 -1
diff -X dontdiff -purN 2.6.5-rc3.clean/drivers/scsi/pcmcia/nsp_debug.c 2.6.5-rc3.kj_func/drivers/scsi/pcmcia/nsp_debug.c
@@ -90,7 +90,7 @@ static void print_commandk (unsigned cha
 	int i, s;
 	printk(KERN_DEBUG);
 	print_opcodek(command[0]);
-	/*printk(KERN_DEBUG __FUNCTION__ " ");*/
+	/*printk(KERN_DEBUG "%s ", __FUNCTION__);*/
 	if ((command[0] >> 5) = 6 ||
 	    (command[0] >> 5) = 7 ) {
 		s = 12; /* vender specific */
drivers/tc/lk201.c +1 -1
diff -X dontdiff -purN 2.6.5-rc3.clean/drivers/tc/lk201.c 2.6.5-rc3.kj_func/drivers/tc/lk201.c
@@ -74,7 +74,7 @@ static int __init lk201_reset(struct dec
 
 	for (i = 0; i < sizeof(lk201_reset_string); i++)
 		if (info->hook->poll_tx_char(info, lk201_reset_string[i])) {
-			printk(__FUNCTION__" transmit timeout\n");
+			printk("%s transmit timeout\n", __FUNCTION__);
 			return -EIO;
 		}
 	return 0;
drivers/tc/zs.c +4 -3
diff -X dontdiff -purN 2.6.5-rc3.clean/drivers/tc/zs.c 2.6.5-rc3.kj_func/drivers/tc/zs.c
@@ -1988,7 +1988,8 @@ unsigned int register_zs_hook(unsigned i
 	struct dec_serial *info = &zs_soft[channel];
 
 	if (info->hook) {
-		printk(__FUNCTION__": line %d has already a hook registered\n", channel);
+		printk("%s: line %d has already a hook registered\n",
+		       __FUNCTION__, channel);
 
 		return 0;
 	} else {

@@ -2015,8 +2016,8 @@ unsigned int unregister_zs_hook(unsigned
                 info->hook = NULL;
                 return 1;
         } else {
-                printk(__FUNCTION__": trying to unregister hook on line %d,"
-                       " but none is registered\n", channel);
+                printk("%s: trying to unregister hook on line %d,"
+                       " but none is registered\n", __FUNCTION__, channel);
                 return 0;
         }
 }
drivers/usb/serial/kobil_sct.c +1 -1
diff -X dontdiff -purN 2.6.5-rc3.clean/drivers/usb/serial/kobil_sct.c 2.6.5-rc3.kj_func/drivers/usb/serial/kobil_sct.c
@@ -503,7 +503,7 @@ static int kobil_write (struct usb_seria
 
 static int kobil_write_room (struct usb_serial_port *port)
 {
-	//dbg(__FUNCTION__ " - port %d", port->number);
+	//dbg("%s - port %d", __FUNCTION__, port->number);
 	return 8;
 }

_______________________________________________
Kernel-janitors mailing list
[email protected]
http://lists.osdl.org/mailman/listinfo/kernel-janitors

author
#16 lore raw

PATCH 4/5 remove concatenation with

In reply to Tony Breeds
net/8021q/vlan.h +2 -2
diff -X dontdiff -purN 2.6.5-rc3.clean/net/8021q/vlan.h 2.6.5-rc3.kj_func/net/8021q/vlan.h
@@ -19,8 +19,8 @@ I never found it..and the problem seems 
 I'll bet they might prove useful again... --Ben
 
 
-#define VLAN_MEM_DBG(x, y, z) printk(VLAN_DBG __FUNCTION__ ":  "  x, y, z);
-#define VLAN_FMEM_DBG(x, y) printk(VLAN_DBG __FUNCTION__  ":  " x, y);
+#define VLAN_MEM_DBG(x, y, z) printk(VLAN_DBG "%s:  "  x, __FUNCTION__, y, z);
+#define VLAN_FMEM_DBG(x, y) printk(VLAN_DBG "%s:  " x, __FUNCTION__, y);
 */
 
 /* This way they don't do anything! */
net/8021q/vlanproc.c +1 -1
diff -X dontdiff -purN 2.6.5-rc3.clean/net/8021q/vlanproc.c 2.6.5-rc3.kj_func/net/8021q/vlanproc.c
@@ -220,7 +220,7 @@ int vlan_proc_rem_dev(struct net_device 
 	}
 
 #ifdef VLAN_DEBUG
-	printk(VLAN_DBG __FUNCTION__ ": dev: %p\n", vlandev);
+	printk(VLAN_DBG "%s: dev: %p\n", __FUNCTION__, vlandev);
 #endif
 
 	/** NOTE:  This will consume the memory pointed to by dent, it seems. */
net/ipv4/netfilter/ip_conntrack_irc.c +2 -2
diff -X dontdiff -purN 2.6.5-rc3.clean/net/ipv4/netfilter/ip_conntrack_irc.c 2.6.5-rc3.kj_func/net/ipv4/netfilter/ip_conntrack_irc.c
@@ -60,8 +60,8 @@ DECLARE_LOCK(ip_irc_lock);
 struct module *ip_conntrack_irc = THIS_MODULE;
 
 #if 0
-#define DEBUGP(format, args...) printk(KERN_DEBUG __FILE__ ":" __FUNCTION__ \
-					":" format, ## args)
+#define DEBUGP(format, args...) printk(KERN_DEBUG "%s:%s:" format, \
+                                       __FILE__, __FUNCTION__ , ## args)
 #else
 #define DEBUGP(format, args...)
 #endif
net/ipv4/netfilter/ip_conntrack_tftp.c +2 -2
diff -X dontdiff -purN 2.6.5-rc3.clean/net/ipv4/netfilter/ip_conntrack_tftp.c 2.6.5-rc3.kj_func/net/ipv4/netfilter/ip_conntrack_tftp.c
@@ -33,8 +33,8 @@ MODULE_PARM_DESC(ports, "port numbers of
 #endif
 
 #if 0
-#define DEBUGP(format, args...) printk(__FILE__ ":" __FUNCTION__ ": " \
-				       format, ## args)
+#define DEBUGP(format, args...) printk("%s:%s:" format, \
+                                       __FILE__, __FUNCTION__ , ## args)
 #else
 #define DEBUGP(format, args...)
 #endif
net/ipv4/netfilter/ip_nat_tftp.c +2 -2
diff -X dontdiff -purN 2.6.5-rc3.clean/net/ipv4/netfilter/ip_nat_tftp.c 2.6.5-rc3.kj_func/net/ipv4/netfilter/ip_nat_tftp.c
@@ -47,8 +47,8 @@ MODULE_PARM_DESC(ports, "port numbers of
 #endif
 
 #if 0
-#define DEBUGP(format, args...) printk(__FILE__ ":" __FUNCTION__ ": " \
-				       format, ## args)
+#define DEBUGP(format, args...) printk("%s:%s:" format, \
+                                       __FILE__, __FUNCTION__ , ## args)
 #else
 #define DEBUGP(format, args...)
 #endif
net/ipv4/netfilter/ipt_ULOG.c +3 -3
diff -X dontdiff -purN 2.6.5-rc3.clean/net/ipv4/netfilter/ipt_ULOG.c 2.6.5-rc3.kj_func/net/ipv4/netfilter/ipt_ULOG.c
@@ -64,13 +64,13 @@ MODULE_DESCRIPTION("iptables userspace l
 #define ULOG_MAXNLGROUPS	32		/* numer of nlgroups */
 
 #if 0
-#define DEBUGP(format, args...)	printk(__FILE__ ":" __FUNCTION__ ":" \
-				       format, ## args)
+#define DEBUGP(format, args...) printk("%s:%s:" format, \
+                                       __FILE__, __FUNCTION__ , ## args)
 #else
 #define DEBUGP(format, args...)
 #endif
 
-#define PRINTR(format, args...) do { if (net_ratelimit()) printk(format, ## args); } while (0)
+#define PRINTR(format, args...) do { if (net_ratelimit()) printk(format , ## args); } while (0)
 
 static unsigned int nlbufsiz = 4096;
 MODULE_PARM(nlbufsiz, "i");

_______________________________________________
Kernel-janitors mailing list
[email protected]
http://lists.osdl.org/mailman/listinfo/kernel-janitors

author
#17 lore raw

PATCH 5/5 remove concatenation with

In reply to Tony Breeds
sound/oss/au1000.c +6 -6
diff -X dontdiff -purN 2.6.5-rc3.clean/sound/oss/au1000.c 2.6.5-rc3.kj_func/sound/oss/au1000.c
@@ -369,7 +369,7 @@ static void set_adc_rate(struct au1000_s
 	adc_rate = rdcodec(s->codec, AC97_PCM_LR_ADC_RATE);
 
 #ifdef AU1000_VERBOSE_DEBUG
-	dbg(__FUNCTION__ ": set to %d Hz", adc_rate);
+	dbg("%s: set to %d Hz", __FUNCTION__, adc_rate);
 #endif
 
 	// some codec's don't allow unequal DAC and ADC rates, in which case

@@ -420,7 +420,7 @@ static void set_dac_rate(struct au1000_s
 	dac_rate = rdcodec(s->codec, AC97_PCM_FRONT_DAC_RATE);
 
 #ifdef AU1000_VERBOSE_DEBUG
-	dbg(__FUNCTION__ ": set to %d Hz", dac_rate);
+	dbg("%s: set to %d Hz", __FUNCTION__, dac_rate);
 #endif
 
 	// some codec's don't allow unequal DAC and ADC rates, in which case

@@ -989,7 +989,7 @@ static int translate_from_user(struct dm
 	for (sample = 0; sample < num_samples; sample++) {
 		if (copy_from_user(usersample, userbuf,
 				   db->user_bytes_per_sample)) {
-			dbg(__FUNCTION__ ": fault");
+			dbg("%s: fault", __FUNCTION__);
 			return -EFAULT;
 		}
 

@@ -1053,7 +1053,7 @@ static int translate_to_user(struct dmab
 
 		if (copy_to_user(userbuf, usersample,
 				 db->user_bytes_per_sample)) {
-			dbg(__FUNCTION__ ": fault");
+			dbg("%s: fault", __FUNCTION__);
 			return -EFAULT;
 		}
 

@@ -1848,9 +1848,9 @@ static int  au1000_open(struct inode *in
 
 #ifdef AU1000_VERBOSE_DEBUG
 	if (file->f_flags & O_NONBLOCK)
-		dbg(__FUNCTION__ ": non-blocking");
+		dbg("%s: non-blocking", __FUNCTION__);
 	else
-		dbg(__FUNCTION__ ": blocking");
+		dbg("%s: blocking", __FUNCTION__);
 #endif
 	
 	file->private_data = s;
sound/oss/ite8172.c +2 -2
diff -X dontdiff -purN 2.6.5-rc3.clean/sound/oss/ite8172.c 2.6.5-rc3.kj_func/sound/oss/ite8172.c
@@ -1779,9 +1779,9 @@ static int it8172_open(struct inode *ino
     
 #ifdef IT8172_VERBOSE_DEBUG
 	if (file->f_flags & O_NONBLOCK)
-		dbg(__FUNCTION__ ": non-blocking");
+		dbg("%s: non-blocking", __FUNCTION__);
 	else
-		dbg(__FUNCTION__ ": blocking");
+		dbg("%s: blocking", __FUNCTION__);
 #endif
 	
 	for (list = devs.next; ; list = list->next) {
sound/oss/rme96xx.c +3 -3
diff -X dontdiff -purN 2.6.5-rc3.clean/sound/oss/rme96xx.c 2.6.5-rc3.kj_func/sound/oss/rme96xx.c
@@ -872,7 +872,7 @@ int rme96xx_init(rme96xx_info* s)
 	int status;
 	unsigned short rev;
 
-	DBG(printk(__FUNCTION__"\n"));
+	DBG(printk("%s\n", __FUNCTION__));
 	numcards++;
 
 	s->magic = RME96xx_MAGIC; 

@@ -972,7 +972,7 @@ static int __devinit rme96xx_probe(struc
 	int i;
 	rme96xx_info *s;
 
-	DBG(printk(__FUNCTION__"\n"));
+	DBG(printk("%s\n", __FUNCTION__));
 	
 	if (pcidev->irq = 0) 
 		return -1;

@@ -1501,7 +1501,7 @@ static int rme96xx_release(struct inode 
 {
 	struct dmabuf * dma = (struct dmabuf*) file->private_data;
 	/* int hwp;  ... was unused   HP20020201 */
-	DBG(printk(__FUNCTION__"\n"));
+	DBG(printk("%s\n", __FUNCTION__));
 
 	COMM          ("draining")
 	if (dma->open_mode & FMODE_WRITE) {
sound/oss/vwsnd.c +2 -2
diff -X dontdiff -purN 2.6.5-rc3.clean/sound/oss/vwsnd.c 2.6.5-rc3.kj_func/sound/oss/vwsnd.c
@@ -196,8 +196,8 @@ static void dbgassert(const char *fcn, i
 #define ASSERT(e)      ((e) ? (void) 0 : dbgassert(__FUNCTION__, __LINE__, #e))
 #define DBGDO(x)            x
 #define DBGX(fmt, args...)  (in_interrupt() ? 0 : printk(KERN_ERR fmt, ##args))
-#define DBGP(fmt, args...)  (DBGX(__FUNCTION__ ": " fmt, ##args))
-#define DBGE(fmt, args...)  (DBGX(__FUNCTION__ fmt, ##args))
+#define DBGP(fmt, args...)  (DBGX("%s: " fmt, __FUNCTION__ , ##args))
+#define DBGE(fmt, args...)  (DBGX("%s" fmt, __FUNCTION__ , ##args))
 #define DBGC(rtn)           (DBGP("calling %s\n", rtn))
 #define DBGR()              (DBGP("returning\n"))
 #define DBGXV(fmt, args...) (shut_up ? 0 : DBGX(fmt, ##args))

_______________________________________________
Kernel-janitors mailing list
[email protected]
http://lists.osdl.org/mailman/listinfo/kernel-janitors

author
#18 lore raw

cover remove concatenation with

In reply to Tony Breeds

Hello all,
Somewhere the the recent past GCC started warning:
"concatenation of string literals with __FUNCTION__ is deprecated"

The following 5 patches work to change most of the offending code from:

	printk("Hi" __FUNCTION__ "\n"); to 
	printk("Hi%s\n.", __FUNCTION__);

In addition, these patches also "fix" the broken varargs for gcc-2.95 and earlier (as pointed out by Arnd Bergmann) in statements I'm already touching.

I've taken these patches against 2.6.5-rc3.

I think I've gotten things correct this time but as always feedback welcome.

Yours Tony

linux.conf.au http://lca2005.linux.org.au/
Apr 18-23 2005 The Australian Linux Technical Conference!

_______________________________________________
Kernel-janitors mailing list
[email protected]
http://lists.osdl.org/mailman/listinfo/kernel-janitors