Commit 80a914dc authored by Harvey Harrison's avatar Harvey Harrison Committed by Linus Torvalds
Browse files

misc: replace __FUNCTION__ with __func__ 



__FUNCTION__ is gcc-specific, use __func__

Signed-off-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d5c003b4

arch/m32r/kernel/process.c

+1 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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);

}

drivers/gpu/drm/i915/i915_dma.c

+2 −2
Original line number Diff line number Diff line
@@ -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/input/joystick/xpad.c

+2 −2
Original line number Diff line number Diff line
@@ -455,10 +455,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/s390/net/ctcm_mpc.c

+1 −1
Original line number Diff line number Diff line
@@ -1673,7 +1673,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;

	}