Skip to content

Commit

Permalink
[media] ec100: use Kernel dev_foo() logging
Browse files Browse the repository at this point in the history
Signed-off-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Antti Palosaari authored and Mauro Carvalho Chehab committed Sep 23, 2012
1 parent 8df379c commit 20399b3
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 53 deletions.
23 changes: 10 additions & 13 deletions drivers/media/dvb-frontends/ec100.c
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,8 @@
*/

#include "dvb_frontend.h"
#include "ec100_priv.h"
#include "ec100.h"

int ec100_debug;
module_param_named(debug, ec100_debug, int, 0644);
MODULE_PARM_DESC(debug, "Turn on/off frontend debugging (default:off).");

struct ec100_state {
struct i2c_adapter *i2c;
struct dvb_frontend frontend;
Expand All @@ -46,7 +41,8 @@ static int ec100_write_reg(struct ec100_state *state, u8 reg, u8 val)
.buf = buf};

if (i2c_transfer(state->i2c, &msg, 1) != 1) {
warn("I2C write failed reg:%02x", reg);
dev_warn(&state->i2c->dev, "%s: i2c wr failed reg=%02x\n",
KBUILD_MODNAME, reg);
return -EREMOTEIO;
}
return 0;
Expand All @@ -70,7 +66,8 @@ static int ec100_read_reg(struct ec100_state *state, u8 reg, u8 *val)
};

if (i2c_transfer(state->i2c, msg, 2) != 2) {
warn("I2C read failed reg:%02x", reg);
dev_warn(&state->i2c->dev, "%s: i2c rd failed reg=%02x\n",
KBUILD_MODNAME, reg);
return -EREMOTEIO;
}
return 0;
Expand All @@ -83,8 +80,8 @@ static int ec100_set_frontend(struct dvb_frontend *fe)
int ret;
u8 tmp, tmp2;

deb_info("%s: freq:%d bw:%d\n", __func__, c->frequency,
c->bandwidth_hz);
dev_dbg(&state->i2c->dev, "%s: frequency=%d bandwidth_hz=%d\n",
__func__, c->frequency, c->bandwidth_hz);

/* program tuner */
if (fe->ops.tuner_ops.set_params)
Expand Down Expand Up @@ -150,7 +147,7 @@ static int ec100_set_frontend(struct dvb_frontend *fe)

return ret;
error:
deb_info("%s: failed:%d\n", __func__, ret);
dev_dbg(&state->i2c->dev, "%s: failed=%d\n", __func__, ret);
return ret;
}

Expand Down Expand Up @@ -196,7 +193,7 @@ static int ec100_read_status(struct dvb_frontend *fe, fe_status_t *status)

return ret;
error:
deb_info("%s: failed:%d\n", __func__, ret);
dev_dbg(&state->i2c->dev, "%s: failed=%d\n", __func__, ret);
return ret;
}

Expand Down Expand Up @@ -228,7 +225,7 @@ static int ec100_read_ber(struct dvb_frontend *fe, u32 *ber)

return ret;
error:
deb_info("%s: failed:%d\n", __func__, ret);
dev_dbg(&state->i2c->dev, "%s: failed=%d\n", __func__, ret);
return ret;
}

Expand All @@ -248,7 +245,7 @@ static int ec100_read_signal_strength(struct dvb_frontend *fe, u16 *strength)

return ret;
error:
deb_info("%s: failed:%d\n", __func__, ret);
dev_dbg(&state->i2c->dev, "%s: failed=%d\n", __func__, ret);
return ret;
}

Expand Down
2 changes: 1 addition & 1 deletion drivers/media/dvb-frontends/ec100.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ extern struct dvb_frontend *ec100_attach(const struct ec100_config *config,
static inline struct dvb_frontend *ec100_attach(
const struct ec100_config *config, struct i2c_adapter *i2c)
{
printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
pr_warn("%s: driver disabled by Kconfig\n", __func__);
return NULL;
}
#endif
Expand Down
39 changes: 0 additions & 39 deletions drivers/media/dvb-frontends/ec100_priv.h

This file was deleted.

0 comments on commit 20399b3

Please sign in to comment.