Commit 9b4778f6 authored by Harvey Harrison's avatar Harvey Harrison Committed by Linus Torvalds
Browse files

trivial: replace last usages of __FUNCTION__ in kernel 



__FUNCTION__ is gcc-specific, use __func__

Signed-off-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Acked-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 8cfc7f9c

arch/x86/mm/numa_32.c

+2 −2
Original line number Diff line number Diff line
@@ -239,7 +239,7 @@ void resume_map_numa_kva(pgd_t *pgd_base) 
		start_pfn = node_remap_start_pfn[node];

		size = node_remap_size[node];



		printk(KERN_DEBUG "%s: node %d\n", __FUNCTION__, node);

		printk(KERN_DEBUG "%s: node %d\n", __func__, node);



		for (pfn = 0; pfn < size; pfn += PTRS_PER_PTE) {

			unsigned long vaddr = start_va + (pfn << PAGE_SHIFT);
@@ -251,7 +251,7 @@ void resume_map_numa_kva(pgd_t *pgd_base) 
						PAGE_KERNEL_LARGE_EXEC));



			printk(KERN_DEBUG "%s: %08lx -> pfn %08lx\n",

				__FUNCTION__, vaddr, start_pfn + pfn);

				__func__, vaddr, start_pfn + pfn);

		}

	}

}

drivers/gpu/drm/drm_crtc.c

+1 −1
Original line number Diff line number Diff line
@@ -210,7 +210,7 @@ static int drm_mode_object_get(struct drm_device *dev, 
	int ret;



	WARN(!mutex_is_locked(&dev->mode_config.mutex),

	     "%s called w/o mode_config lock\n", __FUNCTION__);

	     "%s called w/o mode_config lock\n", __func__);

again:

	if (idr_pre_get(&dev->mode_config.crtc_idr, GFP_KERNEL) == 0) {

		DRM_ERROR("Ran out memory getting a mode number\n");

drivers/gpu/drm/i915/i915_gem.c

+2 −2
Original line number Diff line number Diff line
@@ -1445,7 +1445,7 @@ static void i915_write_fence_reg(struct drm_i915_fence_reg *reg) 


	if ((obj_priv->gtt_offset & ~I915_FENCE_START_MASK) ||

	    (obj_priv->gtt_offset & (obj->size - 1))) {

		WARN(1, "%s: object not 1M or size aligned\n", __FUNCTION__);

		WARN(1, "%s: object not 1M or size aligned\n", __func__);

		return;

	}
@@ -1478,7 +1478,7 @@ static void i830_write_fence_reg(struct drm_i915_fence_reg *reg) 


	if ((obj_priv->gtt_offset & ~I915_FENCE_START_MASK) ||

	    (obj_priv->gtt_offset & (obj->size - 1))) {

		WARN(1, "%s: object not 1M or size aligned\n", __FUNCTION__);

		WARN(1, "%s: object not 1M or size aligned\n", __func__);

		return;

	}

drivers/media/dvb/frontends/lgdt3304.c

+5 −5
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ static int i2c_write_demod_bytes (struct dvb_frontend *fe, __u8 *buf, int len) 


	for (i=0; i<len-1; i+=3){

		if((err = i2c_transfer(state->i2c, &i2cmsgs, 1))<0) {

			printk("%s i2c_transfer error %d\n", __FUNCTION__, err);

			printk("%s i2c_transfer error %d\n", __func__, err);

			if (err < 0)

				return err;

			else
@@ -73,7 +73,7 @@ static int lgdt3304_i2c_read_reg(struct dvb_frontend *fe, unsigned int reg) 
	i2cmsgs[1].buf = &buf;



	if((ret = i2c_transfer(state->i2c, i2cmsgs, 2))<0) {

		printk("%s i2c_transfer error %d\n", __FUNCTION__, ret);

		printk("%s i2c_transfer error %d\n", __func__, ret);

		return ret;

	}
@@ -94,7 +94,7 @@ static int lgdt3304_i2c_write_reg(struct dvb_frontend *fe, int reg, int val) 
	};

	ret = i2c_transfer(state->i2c, &i2cmsgs, 1);

	if (ret != 1) {

		printk("%s i2c_transfer error %d\n", __FUNCTION__, ret);

		printk("%s i2c_transfer error %d\n", __func__, ret);

		return ret;

	}
@@ -238,7 +238,7 @@ static int lgdt3304_set_parameters(struct dvb_frontend *fe, struct dvb_frontend_ 
		}



		if (err) {

			printk("%s error setting modulation\n", __FUNCTION__);

			printk("%s error setting modulation\n", __func__);

		} else {

			state->current_modulation = param->u.vsb.modulation;

		}
@@ -305,7 +305,7 @@ static int lgdt3304_read_status(struct dvb_frontend *fe, fe_status_t *status) 
		}

		break;

	default:

		printk("%s unhandled modulation\n", __FUNCTION__);

		printk("%s unhandled modulation\n", __func__);

	}

drivers/media/dvb/frontends/s921_module.c

+1 −1
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ static int s921_write(void *dev, u8 reg, u8 val) { 
	};



	if((err = i2c_transfer(state->i2c, &i2cmsgs, 1))<0) {

		printk("%s i2c_transfer error %d\n", __FUNCTION__, err);

		printk("%s i2c_transfer error %d\n", __func__, err);

		if (err < 0)

			return err;

		else