Skip to contentSkip to conversation

misc: replace __FUNCTION__ with __func__

PATCH Applied Harvey Harrison 1 participant 1 message Jul 29, 2008

Subsystems (12)
Network drivers DRM drivers Memory management Media (V4L/DVB) +8 more subsystems
lore
Share & tools
lore

Harvey Harrison

author
#0 lore raw

PATCH 8/8 misc: replace __FUNCTION__ with __func__

__FUNCTION__ is gcc-specific, use __func__

Signed-off-by Harvey Harrison <[email protected]>

---
The leftovers.

 arch/m32r/kernel/process.c                 |    2 +-
 arch/x86/kvm/x86.c                         |    2 +-
 arch/xtensa/kernel/irq.c                   |    2 +-
 drivers/gpu/drm/i915/i915_dma.c            |    4 ++--
 drivers/gpu/drm/i915/i915_irq.c            |    2 +-
 drivers/input/joystick/xpad.c              |    4 ++--
 drivers/media/video/cx23885/cx23885-core.c |    2 +-
 drivers/pci/hotplug/pciehp_hpc.c           |    2 +-
 drivers/s390/net/ctcm_mpc.c                |    2 +-
 mm/bootmem.c                               |    2 +-
 10 files changed, 12 insertions(+), 12 deletions(-)
arch/m32r/kernel/process.c +1 -1
index a689e29..5973df8 100644
@@ -11,7 +11,7 @@
 #undef DEBUG_PROCESS
 #ifdef DEBUG_PROCESS
 #define DPRINTK(fmt, args...)  printk("%s:%d:%s: " fmt, __FILE__, __LINE__, \
-  __FUNCTION__, ##args)
+  __func__, ##args)
 #else
 #define DPRINTK(fmt, args...)
 #endif
arch/x86/kvm/x86.c +1 -1
index 5916191..4d92b26 100644
@@ -564,7 +564,7 @@ static void kvm_set_time_scale(uint32_t tsc_khz, struct pvclock_vcpu_time_info *
 	hv_clock->tsc_to_system_mul = div_frac(nsecs, tps32);
 
 	pr_debug("%s: tsc_khz %u, tsc_shift %d, tsc_mul %u\n",
-		 __FUNCTION__, tsc_khz, hv_clock->tsc_shift,
+		 __func__, tsc_khz, hv_clock->tsc_shift,
 		 hv_clock->tsc_to_system_mul);
 }
arch/xtensa/kernel/irq.c +1 -1
index c9ea73b..5fbcde5 100644
@@ -48,7 +48,7 @@ asmlinkage void do_IRQ(int irq, struct pt_regs *regs)
 
 	if (irq >= NR_IRQS) {
 		printk(KERN_EMERG "%s: cannot handle IRQ %d\n",
-				__FUNCTION__, irq);
+				__func__, irq);
 	}
 
 	irq_enter();
drivers/gpu/drm/i915/i915_dma.c +2 -2
index 8897434..9ac4720 100644
@@ -517,7 +517,7 @@ static int i915_dispatch_flip(struct drm_device * dev)
 	RING_LOCALS;
 
 	DRM_DEBUG("%s: page=%d pfCurrentPage=%d\n",
-		  __FUNCTION__,
+		  __func__,
 		  dev_priv->current_page,
 		  dev_priv->sarea_priv->pf_current_page);
 

@@ -642,7 +642,7 @@ static int i915_cmdbuffer(struct drm_device *dev, void *data,
 static int i915_flip_bufs(struct drm_device *dev, void *data,
 			  struct drm_file *file_priv)
 {
-	DRM_DEBUG("%s\n", __FUNCTION__);
+	DRM_DEBUG("%s\n", __func__);
 
 	LOCK_TEST_WITH_RETURN(dev, file_priv);
drivers/gpu/drm/i915/i915_irq.c +1 -1
index df03611..17a7420 100644
@@ -243,7 +243,7 @@ irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)
 
 	temp &= (USER_INT_FLAG | VSYNC_PIPEA_FLAG | VSYNC_PIPEB_FLAG);
 
-	DRM_DEBUG("%s flag=%08x\n", __FUNCTION__, temp);
+	DRM_DEBUG("%s flag=%08x\n", __func__, temp);
 
 	if (temp == 0)
 		return IRQ_NONE;
drivers/input/joystick/xpad.c +2 -2
index 87d3e7e..0a480ed 100644
@@ -454,10 +454,10 @@ static void xpad_bulk_out(struct urb *urb)
 	case -ENOENT:
 	case -ESHUTDOWN:
 		/* this urb is terminated, clean up */
-		dbg("%s - urb shutting down with status: %d", __FUNCTION__, urb->status);
+		dbg("%s - urb shutting down with status: %d", __func__, urb->status);
 		break;
 	default:
-		dbg("%s - nonzero urb status received: %d", __FUNCTION__, urb->status);
+		dbg("%s - nonzero urb status received: %d", __func__, urb->status);
 	}
 }
drivers/media/video/cx23885/cx23885-core.c +1 -1
index 6286a9c..c370de9 100644
@@ -1442,7 +1442,7 @@ void cx23885_cancel_buffers(struct cx23885_tsport *port)
 	struct cx23885_dev *dev = port->dev;
 	struct cx23885_dmaqueue *q = &port->mpegq;
 
-	dprintk(1, "%s()\n", __FUNCTION__);
+	dprintk(1, "%s()\n", __func__);
 	del_timer_sync(&q->timeout);
 	cx23885_stop_dma(port);
 	do_cancel_buffers(port, "cancel", 0);
drivers/pci/hotplug/pciehp_hpc.c +1 -1
index ad27e9e..8268189 100644
@@ -765,7 +765,7 @@ static irqreturn_t pcie_isr(int irq, void *dev_id)
 		}
 	} while (detected);
 
-	dbg("%s: intr_loc %x\n", __FUNCTION__, intr_loc);
+	dbg("%s: intr_loc %x\n", __func__, intr_loc);
 
 	/* Check Command Complete Interrupt Pending */
 	if (intr_loc & CMD_COMPLETED) {
drivers/s390/net/ctcm_mpc.c +1 -1
index 49ae1cd..7297b35 100644
@@ -1674,7 +1674,7 @@ static int mpc_validate_xid(struct mpcg_info *mpcginfo)
 
 done:
 	if (rc) {
-		ctcm_pr_info("ctcmpc	   :  %s() failed\n", __FUNCTION__);
+		ctcm_pr_info("ctcmpc	   :  %s() failed\n", __func__);
 		priv->xid->xid2_flag2 = 0x40;
 		grp->saved_xid2->xid2_flag2 = 0x40;
 	}
mm/bootmem.c +1 -1
index 4af15d0..dd73036 100644
@@ -48,7 +48,7 @@ early_param("bootmem_debug", bootmem_debug_setup);
 	if (unlikely(bootmem_debug))			\
 		printk(KERN_INFO			\
 			"bootmem::%s " fmt,		\
-			__FUNCTION__, ## args);		\
+			__func__, ## args);		\
 })
 
 static unsigned long __init bootmap_bytes(unsigned long pages)
Signature · 1 line
1.6.0.rc1.154.ge3fc