diff options
Diffstat (limited to 'drivers/media/dvb/frontends/stv0297.c')
| -rw-r--r-- | drivers/media/dvb/frontends/stv0297.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/media/dvb/frontends/stv0297.c b/drivers/media/dvb/frontends/stv0297.c index 7c23775f77d..62caf802ed9 100644 --- a/drivers/media/dvb/frontends/stv0297.c +++ b/drivers/media/dvb/frontends/stv0297.c | |||
| @@ -58,7 +58,7 @@ static int stv0297_writereg(struct stv0297_state *state, u8 reg, u8 data) | |||
| 58 | 58 | ||
| 59 | if (ret != 1) | 59 | if (ret != 1) |
| 60 | dprintk("%s: writereg error (reg == 0x%02x, val == 0x%02x, " | 60 | dprintk("%s: writereg error (reg == 0x%02x, val == 0x%02x, " |
| 61 | "ret == %i)\n", __FUNCTION__, reg, data, ret); | 61 | "ret == %i)\n", __func__, reg, data, ret); |
| 62 | 62 | ||
| 63 | return (ret != 1) ? -1 : 0; | 63 | return (ret != 1) ? -1 : 0; |
| 64 | } | 64 | } |
| @@ -75,16 +75,16 @@ static int stv0297_readreg(struct stv0297_state *state, u8 reg) | |||
| 75 | // this device needs a STOP between the register and data | 75 | // this device needs a STOP between the register and data |
| 76 | if (state->config->stop_during_read) { | 76 | if (state->config->stop_during_read) { |
| 77 | if ((ret = i2c_transfer(state->i2c, &msg[0], 1)) != 1) { | 77 | if ((ret = i2c_transfer(state->i2c, &msg[0], 1)) != 1) { |
| 78 | dprintk("%s: readreg error (reg == 0x%02x, ret == %i)\n", __FUNCTION__, reg, ret); | 78 | dprintk("%s: readreg error (reg == 0x%02x, ret == %i)\n", __func__, reg, ret); |
| 79 | return -1; | 79 | return -1; |
| 80 | } | 80 | } |
| 81 | if ((ret = i2c_transfer(state->i2c, &msg[1], 1)) != 1) { | 81 | if ((ret = i2c_transfer(state->i2c, &msg[1], 1)) != 1) { |
| 82 | dprintk("%s: readreg error (reg == 0x%02x, ret == %i)\n", __FUNCTION__, reg, ret); | 82 | dprintk("%s: readreg error (reg == 0x%02x, ret == %i)\n", __func__, reg, ret); |
| 83 | return -1; | 83 | return -1; |
| 84 | } | 84 | } |
| 85 | } else { | 85 | } else { |
| 86 | if ((ret = i2c_transfer(state->i2c, msg, 2)) != 2) { | 86 | if ((ret = i2c_transfer(state->i2c, msg, 2)) != 2) { |
| 87 | dprintk("%s: readreg error (reg == 0x%02x, ret == %i)\n", __FUNCTION__, reg, ret); | 87 | dprintk("%s: readreg error (reg == 0x%02x, ret == %i)\n", __func__, reg, ret); |
| 88 | return -1; | 88 | return -1; |
| 89 | } | 89 | } |
| 90 | } | 90 | } |
| @@ -115,16 +115,16 @@ static int stv0297_readregs(struct stv0297_state *state, u8 reg1, u8 * b, u8 len | |||
| 115 | // this device needs a STOP between the register and data | 115 | // this device needs a STOP between the register and data |
| 116 | if (state->config->stop_during_read) { | 116 | if (state->config->stop_during_read) { |
| 117 | if ((ret = i2c_transfer(state->i2c, &msg[0], 1)) != 1) { | 117 | if ((ret = i2c_transfer(state->i2c, &msg[0], 1)) != 1) { |
| 118 | dprintk("%s: readreg error (reg == 0x%02x, ret == %i)\n", __FUNCTION__, reg1, ret); | 118 | dprintk("%s: readreg error (reg == 0x%02x, ret == %i)\n", __func__, reg1, ret); |
| 119 | return -1; | 119 | return -1; |
| 120 | } | 120 | } |
| 121 | if ((ret = i2c_transfer(state->i2c, &msg[1], 1)) != 1) { | 121 | if ((ret = i2c_transfer(state->i2c, &msg[1], 1)) != 1) { |
| 122 | dprintk("%s: readreg error (reg == 0x%02x, ret == %i)\n", __FUNCTION__, reg1, ret); | 122 | dprintk("%s: readreg error (reg == 0x%02x, ret == %i)\n", __func__, reg1, ret); |
| 123 | return -1; | 123 | return -1; |
| 124 | } | 124 | } |
| 125 | } else { | 125 | } else { |
| 126 | if ((ret = i2c_transfer(state->i2c, msg, 2)) != 2) { | 126 | if ((ret = i2c_transfer(state->i2c, msg, 2)) != 2) { |
| 127 | dprintk("%s: readreg error (reg == 0x%02x, ret == %i)\n", __FUNCTION__, reg1, ret); | 127 | dprintk("%s: readreg error (reg == 0x%02x, ret == %i)\n", __func__, reg1, ret); |
| 128 | return -1; | 128 | return -1; |
| 129 | } | 129 | } |
| 130 | } | 130 | } |