aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/tuners/tua9001.c
diff options
context:
space:
mode:
authorAntti Palosaari <crope@iki.fi>2012-09-11 21:27:10 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-09-23 18:46:26 -0400
commite6211c7c99ad9e13b28698d4258763b5bb7420e1 (patch)
treec74601965588350b1e31abb9033c38bbe9dde82d /drivers/media/tuners/tua9001.c
parent5db4187a037fb9e4b6908ef7bcef0f79395b398f (diff)
[media] tua9001: use dev_foo logging
Signed-off-by: Antti Palosaari <crope@iki.fi> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/tuners/tua9001.c')
-rw-r--r--drivers/media/tuners/tua9001.c31
1 files changed, 22 insertions, 9 deletions
diff --git a/drivers/media/tuners/tua9001.c b/drivers/media/tuners/tua9001.c
index 6147eeef4a66..e6394fc884b0 100644
--- a/drivers/media/tuners/tua9001.c
+++ b/drivers/media/tuners/tua9001.c
@@ -39,8 +39,8 @@ static int tua9001_wr_reg(struct tua9001_priv *priv, u8 reg, u16 val)
39 if (ret == 1) { 39 if (ret == 1) {
40 ret = 0; 40 ret = 0;
41 } else { 41 } else {
42 printk(KERN_WARNING "%s: I2C wr failed=%d reg=%02x\n", 42 dev_warn(&priv->i2c->dev, "%s: i2c wr failed=%d reg=%02x\n",
43 __func__, ret, reg); 43 KBUILD_MODNAME, ret, reg);
44 ret = -EREMOTEIO; 44 ret = -EREMOTEIO;
45 } 45 }
46 46
@@ -52,6 +52,8 @@ static int tua9001_release(struct dvb_frontend *fe)
52 struct tua9001_priv *priv = fe->tuner_priv; 52 struct tua9001_priv *priv = fe->tuner_priv;
53 int ret = 0; 53 int ret = 0;
54 54
55 dev_dbg(&priv->i2c->dev, "%s:\n", __func__);
56
55 if (fe->callback) 57 if (fe->callback)
56 ret = fe->callback(priv->i2c, DVB_FRONTEND_COMPONENT_TUNER, 58 ret = fe->callback(priv->i2c, DVB_FRONTEND_COMPONENT_TUNER,
57 TUA9001_CMD_CEN, 0); 59 TUA9001_CMD_CEN, 0);
@@ -85,6 +87,8 @@ static int tua9001_init(struct dvb_frontend *fe)
85 { 0x34, 0x0a40 }, 87 { 0x34, 0x0a40 },
86 }; 88 };
87 89
90 dev_dbg(&priv->i2c->dev, "%s:\n", __func__);
91
88 if (fe->callback) { 92 if (fe->callback) {
89 ret = fe->callback(priv->i2c, DVB_FRONTEND_COMPONENT_TUNER, 93 ret = fe->callback(priv->i2c, DVB_FRONTEND_COMPONENT_TUNER,
90 TUA9001_CMD_RESETN, 0); 94 TUA9001_CMD_RESETN, 0);
@@ -106,7 +110,7 @@ err_i2c_gate_ctrl:
106 fe->ops.i2c_gate_ctrl(fe, 0); /* close i2c-gate */ 110 fe->ops.i2c_gate_ctrl(fe, 0); /* close i2c-gate */
107err: 111err:
108 if (ret < 0) 112 if (ret < 0)
109 pr_debug("%s: failed=%d\n", __func__, ret); 113 dev_dbg(&priv->i2c->dev, "%s: failed=%d\n", __func__, ret);
110 114
111 return ret; 115 return ret;
112} 116}
@@ -116,12 +120,14 @@ static int tua9001_sleep(struct dvb_frontend *fe)
116 struct tua9001_priv *priv = fe->tuner_priv; 120 struct tua9001_priv *priv = fe->tuner_priv;
117 int ret = 0; 121 int ret = 0;
118 122
123 dev_dbg(&priv->i2c->dev, "%s:\n", __func__);
124
119 if (fe->callback) 125 if (fe->callback)
120 ret = fe->callback(priv->i2c, DVB_FRONTEND_COMPONENT_TUNER, 126 ret = fe->callback(priv->i2c, DVB_FRONTEND_COMPONENT_TUNER,
121 TUA9001_CMD_RESETN, 1); 127 TUA9001_CMD_RESETN, 1);
122 128
123 if (ret < 0) 129 if (ret < 0)
124 pr_debug("%s: failed=%d\n", __func__, ret); 130 dev_dbg(&priv->i2c->dev, "%s: failed=%d\n", __func__, ret);
125 131
126 return ret; 132 return ret;
127} 133}
@@ -135,9 +141,9 @@ static int tua9001_set_params(struct dvb_frontend *fe)
135 u32 frequency; 141 u32 frequency;
136 struct reg_val data[2]; 142 struct reg_val data[2];
137 143
138 pr_debug("%s: delivery_system=%d frequency=%d bandwidth_hz=%d\n", 144 dev_dbg(&priv->i2c->dev, "%s: delivery_system=%d frequency=%d " \
139 __func__, c->delivery_system, c->frequency, 145 "bandwidth_hz=%d\n", __func__,
140 c->bandwidth_hz); 146 c->delivery_system, c->frequency, c->bandwidth_hz);
141 147
142 switch (c->delivery_system) { 148 switch (c->delivery_system) {
143 case SYS_DVBT: 149 case SYS_DVBT:
@@ -203,13 +209,17 @@ err_i2c_gate_ctrl:
203 fe->ops.i2c_gate_ctrl(fe, 0); /* close i2c-gate */ 209 fe->ops.i2c_gate_ctrl(fe, 0); /* close i2c-gate */
204err: 210err:
205 if (ret < 0) 211 if (ret < 0)
206 pr_debug("%s: failed=%d\n", __func__, ret); 212 dev_dbg(&priv->i2c->dev, "%s: failed=%d\n", __func__, ret);
207 213
208 return ret; 214 return ret;
209} 215}
210 216
211static int tua9001_get_if_frequency(struct dvb_frontend *fe, u32 *frequency) 217static int tua9001_get_if_frequency(struct dvb_frontend *fe, u32 *frequency)
212{ 218{
219 struct tua9001_priv *priv = fe->tuner_priv;
220
221 dev_dbg(&priv->i2c->dev, "%s:\n", __func__);
222
213 *frequency = 0; /* Zero-IF */ 223 *frequency = 0; /* Zero-IF */
214 224
215 return 0; 225 return 0;
@@ -253,7 +263,9 @@ struct dvb_frontend *tua9001_attach(struct dvb_frontend *fe,
253 goto err; 263 goto err;
254 } 264 }
255 265
256 printk(KERN_INFO "Infineon TUA 9001 successfully attached."); 266 dev_info(&priv->i2c->dev,
267 "%s: Infineon TUA 9001 successfully attached\n",
268 KBUILD_MODNAME);
257 269
258 memcpy(&fe->ops.tuner_ops, &tua9001_tuner_ops, 270 memcpy(&fe->ops.tuner_ops, &tua9001_tuner_ops,
259 sizeof(struct dvb_tuner_ops)); 271 sizeof(struct dvb_tuner_ops));
@@ -261,6 +273,7 @@ struct dvb_frontend *tua9001_attach(struct dvb_frontend *fe,
261 fe->tuner_priv = priv; 273 fe->tuner_priv = priv;
262 return fe; 274 return fe;
263err: 275err:
276 dev_dbg(&i2c->dev, "%s: failed=%d\n", __func__, ret);
264 kfree(priv); 277 kfree(priv);
265 return NULL; 278 return NULL;
266} 279}