diff options
author | Harvey Harrison <harvey.harrison@gmail.com> | 2009-01-07 17:42:41 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-07 18:48:54 -0500 |
commit | 9b4778f680aa79d838ae2be6ab958938f744ce5f (patch) | |
tree | 3f3fc913d8141147898c29ed36b8a43ec20683b1 /drivers/media | |
parent | 8cfc7f9c005313ecd4e98ad1feb391d8dfce9ed2 (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>
Diffstat (limited to 'drivers/media')
-rw-r--r-- | drivers/media/dvb/frontends/lgdt3304.c | 10 | ||||
-rw-r--r-- | drivers/media/dvb/frontends/s921_module.c | 2 | ||||
-rw-r--r-- | drivers/media/dvb/ttpci/budget-ci.c | 2 |
3 files changed, 7 insertions, 7 deletions
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 | } |