Skip to content

Commit

Permalink
V4L/DVB (7513): media/dvb/dvb-usb replace remaining __FUNCTION__ occu…
Browse files Browse the repository at this point in the history 
…rrences

__FUNCTION__ is gcc-specific, use __func__

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
  • Loading branch information
Harvey Harrison authored and Mauro Carvalho Chehab committed Apr 24, 2008
1 parent 46b4f7c commit 708bebd
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 20 deletions.
6 changes: 3 additions & 3 deletions drivers/media/dvb/dvb-usb/cxusb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -492,14 +492,14 @@ static int dvico_bluebird_xc2028_callback(void *ptr, int command, int arg)

switch (command) {
case XC2028_TUNER_RESET:
deb_info("%s: XC2028_TUNER_RESET %d\n", __FUNCTION__, arg);
deb_info("%s: XC2028_TUNER_RESET %d\n", __func__, arg);
cxusb_bluebird_gpio_pulse(d, 0x01, 1);
break;
case XC2028_RESET_CLK:
deb_info("%s: XC2028_RESET_CLK %d\n", __FUNCTION__, arg);
deb_info("%s: XC2028_RESET_CLK %d\n", __func__, arg);
break;
default:
deb_info("%s: unknown command %d, arg %d\n", __FUNCTION__,
deb_info("%s: unknown command %d, arg %d\n", __func__,
command, arg);
return -EINVAL;
}
Expand Down
4 changes: 2 additions & 2 deletions drivers/media/dvb/dvb-usb/gp8psk-fe.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ static int gp8psk_fe_send_diseqc_msg (struct dvb_frontend* fe,
{
struct gp8psk_fe_state *st = fe->demodulator_priv;

deb_fe("%s\n",__FUNCTION__);
deb_fe("%s\n",__func__);

if (gp8psk_usb_out_op(st->d,SEND_DISEQC_COMMAND, m->msg[0], 0,
m->msg, m->msg_len)) {
Expand All @@ -167,7 +167,7 @@ static int gp8psk_fe_send_diseqc_burst (struct dvb_frontend* fe,
struct gp8psk_fe_state *st = fe->demodulator_priv;
u8 cmd;

deb_fe("%s\n",__FUNCTION__);
deb_fe("%s\n",__func__);

/* These commands are certainly wrong */
cmd = (burst == SEC_MINI_A) ? 0x00 : 0x01;
Expand Down
12 changes: 6 additions & 6 deletions drivers/media/dvb/dvb-usb/m920x.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -477,7 +477,7 @@ static struct qt1010_config m920x_qt1010_config = {
/* Callbacks for DVB USB */
static int m920x_mt352_frontend_attach(struct dvb_usb_adapter *adap)
{
deb("%s\n",__FUNCTION__);
deb("%s\n",__func__);

if ((adap->fe = dvb_attach(mt352_attach,
&m920x_mt352_config,
Expand All @@ -489,7 +489,7 @@ static int m920x_mt352_frontend_attach(struct dvb_usb_adapter *adap)

static int m920x_tda10046_08_frontend_attach(struct dvb_usb_adapter *adap)
{
deb("%s\n",__FUNCTION__);
deb("%s\n",__func__);

if ((adap->fe = dvb_attach(tda10046_attach,
&m920x_tda10046_08_config,
Expand All @@ -501,7 +501,7 @@ static int m920x_tda10046_08_frontend_attach(struct dvb_usb_adapter *adap)

static int m920x_tda10046_0b_frontend_attach(struct dvb_usb_adapter *adap)
{
deb("%s\n",__FUNCTION__);
deb("%s\n",__func__);

if ((adap->fe = dvb_attach(tda10046_attach,
&m920x_tda10046_0b_config,
Expand All @@ -513,7 +513,7 @@ static int m920x_tda10046_0b_frontend_attach(struct dvb_usb_adapter *adap)

static int m920x_qt1010_tuner_attach(struct dvb_usb_adapter *adap)
{
deb("%s\n",__FUNCTION__);
deb("%s\n",__func__);

if (dvb_attach(qt1010_attach, adap->fe, &adap->dev->i2c_adap, &m920x_qt1010_config) == NULL)
return -ENODEV;
Expand All @@ -523,7 +523,7 @@ static int m920x_qt1010_tuner_attach(struct dvb_usb_adapter *adap)

static int m920x_tda8275_60_tuner_attach(struct dvb_usb_adapter *adap)
{
deb("%s\n",__FUNCTION__);
deb("%s\n",__func__);

if (dvb_attach(tda827x_attach, adap->fe, 0x60, &adap->dev->i2c_adap, NULL) == NULL)
return -ENODEV;
Expand All @@ -533,7 +533,7 @@ static int m920x_tda8275_60_tuner_attach(struct dvb_usb_adapter *adap)

static int m920x_tda8275_61_tuner_attach(struct dvb_usb_adapter *adap)
{
deb("%s\n",__FUNCTION__);
deb("%s\n",__func__);

if (dvb_attach(tda827x_attach, adap->fe, 0x61, &adap->dev->i2c_adap, NULL) == NULL)
return -ENODEV;
Expand Down
18 changes: 9 additions & 9 deletions drivers/media/dvb/dvb-usb/vp702x-fe.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ static int vp702x_fe_read_status(struct dvb_frontend* fe, fe_status_t *status)
{
struct vp702x_fe_state *st = fe->demodulator_priv;
vp702x_fe_refresh_state(st);
deb_fe("%s\n",__FUNCTION__);
deb_fe("%s\n",__func__);

if (st->lock == 0)
*status = FE_HAS_LOCK | FE_HAS_SYNC | FE_HAS_VITERBI | FE_HAS_SIGNAL | FE_HAS_CARRIER;
Expand Down Expand Up @@ -121,7 +121,7 @@ static int vp702x_fe_read_snr(struct dvb_frontend* fe, u16 *snr)

static int vp702x_fe_get_tune_settings(struct dvb_frontend* fe, struct dvb_frontend_tune_settings *tune)
{
deb_fe("%s\n",__FUNCTION__);
deb_fe("%s\n",__func__);
tune->min_delay_ms = 2000;
return 0;
}
Expand Down Expand Up @@ -183,21 +183,21 @@ static int vp702x_fe_set_frontend(struct dvb_frontend* fe,
static int vp702x_fe_init(struct dvb_frontend *fe)
{
struct vp702x_fe_state *st = fe->demodulator_priv;
deb_fe("%s\n",__FUNCTION__);
deb_fe("%s\n",__func__);
vp702x_usb_in_op(st->d, RESET_TUNER, 0, 0, NULL, 0);
return 0;
}

static int vp702x_fe_sleep(struct dvb_frontend *fe)
{
deb_fe("%s\n",__FUNCTION__);
deb_fe("%s\n",__func__);
return 0;
}

static int vp702x_fe_get_frontend(struct dvb_frontend* fe,
struct dvb_frontend_parameters *fep)
{
deb_fe("%s\n",__FUNCTION__);
deb_fe("%s\n",__func__);
return 0;
}

Expand All @@ -208,7 +208,7 @@ static int vp702x_fe_send_diseqc_msg (struct dvb_frontend* fe,
u8 cmd[8],ibuf[10];
memset(cmd,0,8);

deb_fe("%s\n",__FUNCTION__);
deb_fe("%s\n",__func__);

if (m->msg_len > 4)
return -EINVAL;
Expand All @@ -230,15 +230,15 @@ static int vp702x_fe_send_diseqc_msg (struct dvb_frontend* fe,

static int vp702x_fe_send_diseqc_burst (struct dvb_frontend* fe, fe_sec_mini_cmd_t burst)
{
deb_fe("%s\n",__FUNCTION__);
deb_fe("%s\n",__func__);
return 0;
}

static int vp702x_fe_set_tone(struct dvb_frontend* fe, fe_sec_tone_mode_t tone)
{
struct vp702x_fe_state *st = fe->demodulator_priv;
u8 ibuf[10];
deb_fe("%s\n",__FUNCTION__);
deb_fe("%s\n",__func__);

st->tone_mode = tone;

Expand All @@ -263,7 +263,7 @@ static int vp702x_fe_set_voltage (struct dvb_frontend* fe, fe_sec_voltage_t
{
struct vp702x_fe_state *st = fe->demodulator_priv;
u8 ibuf[10];
deb_fe("%s\n",__FUNCTION__);
deb_fe("%s\n",__func__);

st->voltage = voltage;

Expand Down

0 comments on commit 708bebd

Please sign in to comment.