aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb/frontends/a8293.c
diff options
context:
space:
mode:
authorAntti Palosaari <crope@iki.fi>2012-07-02 04:13:58 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-07-05 12:01:47 -0400
commitacc4e826fc930f25e33477869fbafc0964b44d02 (patch)
treedcb7babb432d422d59cad42fe5ea59a5e6f24374 /drivers/media/dvb/frontends/a8293.c
parentf3e16df60bbad0a5447cee55c5def2550714af84 (diff)
[media] a8293: use Kernel dev_* logging
Signed-off-by: Antti Palosaari <crope@iki.fi> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/dvb/frontends/a8293.c')
-rw-r--r--drivers/media/dvb/frontends/a8293.c35
1 files changed, 9 insertions, 26 deletions
diff --git a/drivers/media/dvb/frontends/a8293.c b/drivers/media/dvb/frontends/a8293.c
index 711bd33f1f5c..cff44a389b40 100644
--- a/drivers/media/dvb/frontends/a8293.c
+++ b/drivers/media/dvb/frontends/a8293.c
@@ -21,24 +21,6 @@
21#include "dvb_frontend.h" 21#include "dvb_frontend.h"
22#include "a8293.h" 22#include "a8293.h"
23 23
24static int debug;
25module_param(debug, int, 0644);
26MODULE_PARM_DESC(debug, "Turn on/off debugging (default:off).");
27
28#define LOG_PREFIX "a8293"
29
30#undef dbg
31#define dbg(f, arg...) \
32 if (debug) \
33 printk(KERN_INFO LOG_PREFIX": " f "\n" , ## arg)
34#undef err
35#define err(f, arg...) printk(KERN_ERR LOG_PREFIX": " f "\n" , ## arg)
36#undef info
37#define info(f, arg...) printk(KERN_INFO LOG_PREFIX": " f "\n" , ## arg)
38#undef warn
39#define warn(f, arg...) printk(KERN_WARNING LOG_PREFIX": " f "\n" , ## arg)
40
41
42struct a8293_priv { 24struct a8293_priv {
43 struct i2c_adapter *i2c; 25 struct i2c_adapter *i2c;
44 const struct a8293_config *cfg; 26 const struct a8293_config *cfg;
@@ -65,7 +47,8 @@ static int a8293_i2c(struct a8293_priv *priv, u8 *val, int len, bool rd)
65 if (ret == 1) { 47 if (ret == 1) {
66 ret = 0; 48 ret = 0;
67 } else { 49 } else {
68 warn("i2c failed=%d rd=%d", ret, rd); 50 dev_warn(&priv->i2c->dev, "%s: i2c failed=%d rd=%d\n",
51 KBUILD_MODNAME, ret, rd);
69 ret = -EREMOTEIO; 52 ret = -EREMOTEIO;
70 } 53 }
71 54
@@ -88,7 +71,8 @@ static int a8293_set_voltage(struct dvb_frontend *fe,
88 struct a8293_priv *priv = fe->sec_priv; 71 struct a8293_priv *priv = fe->sec_priv;
89 int ret; 72 int ret;
90 73
91 dbg("%s: fe_sec_voltage=%d", __func__, fe_sec_voltage); 74 dev_dbg(&priv->i2c->dev, "%s: fe_sec_voltage=%d\n", __func__,
75 fe_sec_voltage);
92 76
93 switch (fe_sec_voltage) { 77 switch (fe_sec_voltage) {
94 case SEC_VOLTAGE_OFF: 78 case SEC_VOLTAGE_OFF:
@@ -114,14 +98,12 @@ static int a8293_set_voltage(struct dvb_frontend *fe,
114 98
115 return ret; 99 return ret;
116err: 100err:
117 dbg("%s: failed=%d", __func__, ret); 101 dev_dbg(&priv->i2c->dev, "%s: failed=%d\n", __func__, ret);
118 return ret; 102 return ret;
119} 103}
120 104
121static void a8293_release_sec(struct dvb_frontend *fe) 105static void a8293_release_sec(struct dvb_frontend *fe)
122{ 106{
123 dbg("%s:", __func__);
124
125 a8293_set_voltage(fe, SEC_VOLTAGE_OFF); 107 a8293_set_voltage(fe, SEC_VOLTAGE_OFF);
126 108
127 kfree(fe->sec_priv); 109 kfree(fe->sec_priv);
@@ -164,16 +146,17 @@ struct dvb_frontend *a8293_attach(struct dvb_frontend *fe,
164 if (ret) 146 if (ret)
165 goto err; 147 goto err;
166 148
167 info("Allegro A8293 SEC attached.");
168
169 fe->ops.release_sec = a8293_release_sec; 149 fe->ops.release_sec = a8293_release_sec;
170 150
171 /* override frontend ops */ 151 /* override frontend ops */
172 fe->ops.set_voltage = a8293_set_voltage; 152 fe->ops.set_voltage = a8293_set_voltage;
173 153
154 dev_info(&priv->i2c->dev, "%s: Allegro A8293 SEC attached\n",
155 KBUILD_MODNAME);
156
174 return fe; 157 return fe;
175err: 158err:
176 dbg("%s: failed=%d", __func__, ret); 159 dev_dbg(&i2c->dev, "%s: failed=%d\n", __func__, ret);
177 kfree(priv); 160 kfree(priv);
178 return NULL; 161 return NULL;
179} 162}