aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarvey Harrison <harvey.harrison@gmail.com>2009-01-07 17:42:41 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2009-01-07 18:48:54 -0500
commit9b4778f680aa79d838ae2be6ab958938f744ce5f (patch)
tree3f3fc913d8141147898c29ed36b8a43ec20683b1
parent8cfc7f9c005313ecd4e98ad1feb391d8dfce9ed2 (diff)
trivial: replace last usages of __FUNCTION__ in kernel
__FUNCTION__ is gcc-specific, use __func__ Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com> Acked-by: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--arch/x86/mm/numa_32.c4
-rw-r--r--drivers/gpu/drm/drm_crtc.c2
-rw-r--r--drivers/gpu/drm/i915/i915_gem.c4
-rw-r--r--drivers/media/dvb/frontends/lgdt3304.c10
-rw-r--r--drivers/media/dvb/frontends/s921_module.c2
-rw-r--r--drivers/media/dvb/ttpci/budget-ci.c2
6 files changed, 12 insertions, 12 deletions
diff --git a/arch/x86/mm/numa_32.c b/arch/x86/mm/numa_32.c
index 8518c678d83f..d1f7439d173c 100644
--- a/arch/x86/mm/numa_32.c
+++ b/arch/x86/mm/numa_32.c
@@ -239,7 +239,7 @@ void resume_map_numa_kva(pgd_t *pgd_base)
239 start_pfn = node_remap_start_pfn[node]; 239 start_pfn = node_remap_start_pfn[node];
240 size = node_remap_size[node]; 240 size = node_remap_size[node];
241 241
242 printk(KERN_DEBUG "%s: node %d\n", __FUNCTION__, node); 242 printk(KERN_DEBUG "%s: node %d\n", __func__, node);
243 243
244 for (pfn = 0; pfn < size; pfn += PTRS_PER_PTE) { 244 for (pfn = 0; pfn < size; pfn += PTRS_PER_PTE) {
245 unsigned long vaddr = start_va + (pfn << PAGE_SHIFT); 245 unsigned long vaddr = start_va + (pfn << PAGE_SHIFT);
@@ -251,7 +251,7 @@ void resume_map_numa_kva(pgd_t *pgd_base)
251 PAGE_KERNEL_LARGE_EXEC)); 251 PAGE_KERNEL_LARGE_EXEC));
252 252
253 printk(KERN_DEBUG "%s: %08lx -> pfn %08lx\n", 253 printk(KERN_DEBUG "%s: %08lx -> pfn %08lx\n",
254 __FUNCTION__, vaddr, start_pfn + pfn); 254 __func__, vaddr, start_pfn + pfn);
255 } 255 }
256 } 256 }
257} 257}
diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
index 53c87254be4c..5b2cbb778162 100644
--- a/drivers/gpu/drm/drm_crtc.c
+++ b/drivers/gpu/drm/drm_crtc.c
@@ -210,7 +210,7 @@ static int drm_mode_object_get(struct drm_device *dev,
210 int ret; 210 int ret;
211 211
212 WARN(!mutex_is_locked(&dev->mode_config.mutex), 212 WARN(!mutex_is_locked(&dev->mode_config.mutex),
213 "%s called w/o mode_config lock\n", __FUNCTION__); 213 "%s called w/o mode_config lock\n", __func__);
214again: 214again:
215 if (idr_pre_get(&dev->mode_config.crtc_idr, GFP_KERNEL) == 0) { 215 if (idr_pre_get(&dev->mode_config.crtc_idr, GFP_KERNEL) == 0) {
216 DRM_ERROR("Ran out memory getting a mode number\n"); 216 DRM_ERROR("Ran out memory getting a mode number\n");
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 14afc23a0e24..1384d6686555 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -1445,7 +1445,7 @@ static void i915_write_fence_reg(struct drm_i915_fence_reg *reg)
1445 1445
1446 if ((obj_priv->gtt_offset & ~I915_FENCE_START_MASK) || 1446 if ((obj_priv->gtt_offset & ~I915_FENCE_START_MASK) ||
1447 (obj_priv->gtt_offset & (obj->size - 1))) { 1447 (obj_priv->gtt_offset & (obj->size - 1))) {
1448 WARN(1, "%s: object not 1M or size aligned\n", __FUNCTION__); 1448 WARN(1, "%s: object not 1M or size aligned\n", __func__);
1449 return; 1449 return;
1450 } 1450 }
1451 1451
@@ -1478,7 +1478,7 @@ static void i830_write_fence_reg(struct drm_i915_fence_reg *reg)
1478 1478
1479 if ((obj_priv->gtt_offset & ~I915_FENCE_START_MASK) || 1479 if ((obj_priv->gtt_offset & ~I915_FENCE_START_MASK) ||
1480 (obj_priv->gtt_offset & (obj->size - 1))) { 1480 (obj_priv->gtt_offset & (obj->size - 1))) {
1481 WARN(1, "%s: object not 1M or size aligned\n", __FUNCTION__); 1481 WARN(1, "%s: object not 1M or size aligned\n", __func__);
1482 return; 1482 return;
1483 } 1483 }
1484 1484
diff --git a/drivers/media/dvb/frontends/lgdt3304.c b/drivers/media/dvb/frontends/lgdt3304.c
index 469ace5692c6..3bb0c4394f8a 100644
--- a/drivers/media/dvb/frontends/lgdt3304.c
+++ b/drivers/media/dvb/frontends/lgdt3304.c
@@ -42,7 +42,7 @@ static int i2c_write_demod_bytes (struct dvb_frontend *fe, __u8 *buf, int len)
42 42
43 for (i=0; i<len-1; i+=3){ 43 for (i=0; i<len-1; i+=3){
44 if((err = i2c_transfer(state->i2c, &i2cmsgs, 1))<0) { 44 if((err = i2c_transfer(state->i2c, &i2cmsgs, 1))<0) {
45 printk("%s i2c_transfer error %d\n", __FUNCTION__, err); 45 printk("%s i2c_transfer error %d\n", __func__, err);
46 if (err < 0) 46 if (err < 0)
47 return err; 47 return err;
48 else 48 else
@@ -73,7 +73,7 @@ static int lgdt3304_i2c_read_reg(struct dvb_frontend *fe, unsigned int reg)
73 i2cmsgs[1].buf = &buf; 73 i2cmsgs[1].buf = &buf;
74 74
75 if((ret = i2c_transfer(state->i2c, i2cmsgs, 2))<0) { 75 if((ret = i2c_transfer(state->i2c, i2cmsgs, 2))<0) {
76 printk("%s i2c_transfer error %d\n", __FUNCTION__, ret); 76 printk("%s i2c_transfer error %d\n", __func__, ret);
77 return ret; 77 return ret;
78 } 78 }
79 79
@@ -94,7 +94,7 @@ static int lgdt3304_i2c_write_reg(struct dvb_frontend *fe, int reg, int val)
94 }; 94 };
95 ret = i2c_transfer(state->i2c, &i2cmsgs, 1); 95 ret = i2c_transfer(state->i2c, &i2cmsgs, 1);
96 if (ret != 1) { 96 if (ret != 1) {
97 printk("%s i2c_transfer error %d\n", __FUNCTION__, ret); 97 printk("%s i2c_transfer error %d\n", __func__, ret);
98 return ret; 98 return ret;
99 } 99 }
100 100
@@ -238,7 +238,7 @@ static int lgdt3304_set_parameters(struct dvb_frontend *fe, struct dvb_frontend_
238 } 238 }
239 239
240 if (err) { 240 if (err) {
241 printk("%s error setting modulation\n", __FUNCTION__); 241 printk("%s error setting modulation\n", __func__);
242 } else { 242 } else {
243 state->current_modulation = param->u.vsb.modulation; 243 state->current_modulation = param->u.vsb.modulation;
244 } 244 }
@@ -305,7 +305,7 @@ static int lgdt3304_read_status(struct dvb_frontend *fe, fe_status_t *status)
305 } 305 }
306 break; 306 break;
307 default: 307 default:
308 printk("%s unhandled modulation\n", __FUNCTION__); 308 printk("%s unhandled modulation\n", __func__);
309 } 309 }
310 310
311 311
diff --git a/drivers/media/dvb/frontends/s921_module.c b/drivers/media/dvb/frontends/s921_module.c
index 3cbb9cb2cf47..892af8c9ed57 100644
--- a/drivers/media/dvb/frontends/s921_module.c
+++ b/drivers/media/dvb/frontends/s921_module.c
@@ -136,7 +136,7 @@ static int s921_write(void *dev, u8 reg, u8 val) {
136 }; 136 };
137 137
138 if((err = i2c_transfer(state->i2c, &i2cmsgs, 1))<0) { 138 if((err = i2c_transfer(state->i2c, &i2cmsgs, 1))<0) {
139 printk("%s i2c_transfer error %d\n", __FUNCTION__, err); 139 printk("%s i2c_transfer error %d\n", __func__, err);
140 if (err < 0) 140 if (err < 0)
141 return err; 141 return err;
142 else 142 else
diff --git a/drivers/media/dvb/ttpci/budget-ci.c b/drivers/media/dvb/ttpci/budget-ci.c
index 3507463fdac9..4d2a5cf27c31 100644
--- a/drivers/media/dvb/ttpci/budget-ci.c
+++ b/drivers/media/dvb/ttpci/budget-ci.c
@@ -1450,7 +1450,7 @@ static void frontend_init(struct budget_ci *budget_ci)
1450 if (budget_ci->budget.dvb_frontend) { 1450 if (budget_ci->budget.dvb_frontend) {
1451 if (dvb_attach(stb6100_attach, budget_ci->budget.dvb_frontend, &tt3200_stb6100_config, &budget_ci->budget.i2c_adap)) { 1451 if (dvb_attach(stb6100_attach, budget_ci->budget.dvb_frontend, &tt3200_stb6100_config, &budget_ci->budget.i2c_adap)) {
1452 if (!dvb_attach(lnbp21_attach, budget_ci->budget.dvb_frontend, &budget_ci->budget.i2c_adap, 0, 0)) { 1452 if (!dvb_attach(lnbp21_attach, budget_ci->budget.dvb_frontend, &budget_ci->budget.i2c_adap, 0, 0)) {
1453 printk("%s: No LNBP21 found!\n", __FUNCTION__); 1453 printk("%s: No LNBP21 found!\n", __func__);
1454 dvb_frontend_detach(budget_ci->budget.dvb_frontend); 1454 dvb_frontend_detach(budget_ci->budget.dvb_frontend);
1455 budget_ci->budget.dvb_frontend = NULL; 1455 budget_ci->budget.dvb_frontend = NULL;
1456 } 1456 }