aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb-frontends
diff options
context:
space:
mode:
authorAlan Cox <alan@linux.intel.com>2012-09-02 02:30:15 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-09-18 11:46:27 -0400
commiteb2e2652457e407ff617a4412120e924398e7545 (patch)
treece1908ea9e0917551e8f58a8350336e377b3bd68 /drivers/media/dvb-frontends
parent542f6a52b63359227bbc39e8436a1d7156602d86 (diff)
[media] tda8261: add printk levels
This is done as a minimal printk updating patch to ensure correctness. Yes it should all one day use dev_foo(), but that's one for the maintainers. Resolves-bug: https://bugzilla.kernel.org/show_bug.cgi?id=32932 Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/dvb-frontends')
-rw-r--r--drivers/media/dvb-frontends/tda8261.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/drivers/media/dvb-frontends/tda8261.c b/drivers/media/dvb-frontends/tda8261.c
index 53c7d8f1df28..19c488814e5c 100644
--- a/drivers/media/dvb-frontends/tda8261.c
+++ b/drivers/media/dvb-frontends/tda8261.c
@@ -43,7 +43,7 @@ static int tda8261_read(struct tda8261_state *state, u8 *buf)
43 struct i2c_msg msg = { .addr = config->addr, .flags = I2C_M_RD,.buf = buf, .len = 1 }; 43 struct i2c_msg msg = { .addr = config->addr, .flags = I2C_M_RD,.buf = buf, .len = 1 };
44 44
45 if ((err = i2c_transfer(state->i2c, &msg, 1)) != 1) 45 if ((err = i2c_transfer(state->i2c, &msg, 1)) != 1)
46 printk("%s: read error, err=%d\n", __func__, err); 46 pr_err("%s: read error, err=%d\n", __func__, err);
47 47
48 return err; 48 return err;
49} 49}
@@ -55,7 +55,7 @@ static int tda8261_write(struct tda8261_state *state, u8 *buf)
55 struct i2c_msg msg = { .addr = config->addr, .flags = 0, .buf = buf, .len = 4 }; 55 struct i2c_msg msg = { .addr = config->addr, .flags = 0, .buf = buf, .len = 4 };
56 56
57 if ((err = i2c_transfer(state->i2c, &msg, 1)) != 1) 57 if ((err = i2c_transfer(state->i2c, &msg, 1)) != 1)
58 printk("%s: write error, err=%d\n", __func__, err); 58 pr_err("%s: write error, err=%d\n", __func__, err);
59 59
60 return err; 60 return err;
61} 61}
@@ -69,11 +69,11 @@ static int tda8261_get_status(struct dvb_frontend *fe, u32 *status)
69 *status = 0; 69 *status = 0;
70 70
71 if ((err = tda8261_read(state, &result)) < 0) { 71 if ((err = tda8261_read(state, &result)) < 0) {
72 printk("%s: I/O Error\n", __func__); 72 pr_err("%s: I/O Error\n", __func__);
73 return err; 73 return err;
74 } 74 }
75 if ((result >> 6) & 0x01) { 75 if ((result >> 6) & 0x01) {
76 printk("%s: Tuner Phase Locked\n", __func__); 76 pr_debug("%s: Tuner Phase Locked\n", __func__);
77 *status = 1; 77 *status = 1;
78 } 78 }
79 79
@@ -98,7 +98,7 @@ static int tda8261_get_state(struct dvb_frontend *fe,
98 tstate->bandwidth = 40000000; /* FIXME! need to calculate Bandwidth */ 98 tstate->bandwidth = 40000000; /* FIXME! need to calculate Bandwidth */
99 break; 99 break;
100 default: 100 default:
101 printk("%s: Unknown parameter (param=%d)\n", __func__, param); 101 pr_err("%s: Unknown parameter (param=%d)\n", __func__, param);
102 err = -EINVAL; 102 err = -EINVAL;
103 break; 103 break;
104 } 104 }
@@ -124,11 +124,11 @@ static int tda8261_set_state(struct dvb_frontend *fe,
124 */ 124 */
125 frequency = tstate->frequency; 125 frequency = tstate->frequency;
126 if ((frequency < 950000) || (frequency > 2150000)) { 126 if ((frequency < 950000) || (frequency > 2150000)) {
127 printk("%s: Frequency beyond limits, frequency=%d\n", __func__, frequency); 127 pr_warn("%s: Frequency beyond limits, frequency=%d\n", __func__, frequency);
128 return -EINVAL; 128 return -EINVAL;
129 } 129 }
130 N = (frequency + (div_tab[config->step_size] - 1)) / div_tab[config->step_size]; 130 N = (frequency + (div_tab[config->step_size] - 1)) / div_tab[config->step_size];
131 printk("%s: Step size=%d, Divider=%d, PG=0x%02x (%d)\n", 131 pr_debug("%s: Step size=%d, Divider=%d, PG=0x%02x (%d)\n",
132 __func__, config->step_size, div_tab[config->step_size], N, N); 132 __func__, config->step_size, div_tab[config->step_size], N, N);
133 133
134 buf[0] = (N >> 8) & 0xff; 134 buf[0] = (N >> 8) & 0xff;
@@ -144,25 +144,25 @@ static int tda8261_set_state(struct dvb_frontend *fe,
144 144
145 /* Set params */ 145 /* Set params */
146 if ((err = tda8261_write(state, buf)) < 0) { 146 if ((err = tda8261_write(state, buf)) < 0) {
147 printk("%s: I/O Error\n", __func__); 147 pr_err("%s: I/O Error\n", __func__);
148 return err; 148 return err;
149 } 149 }
150 /* sleep for some time */ 150 /* sleep for some time */
151 printk("%s: Waiting to Phase LOCK\n", __func__); 151 pr_debug("%s: Waiting to Phase LOCK\n", __func__);
152 msleep(20); 152 msleep(20);
153 /* check status */ 153 /* check status */
154 if ((err = tda8261_get_status(fe, &status)) < 0) { 154 if ((err = tda8261_get_status(fe, &status)) < 0) {
155 printk("%s: I/O Error\n", __func__); 155 pr_err("%s: I/O Error\n", __func__);
156 return err; 156 return err;
157 } 157 }
158 if (status == 1) { 158 if (status == 1) {
159 printk("%s: Tuner Phase locked: status=%d\n", __func__, status); 159 pr_debug("%s: Tuner Phase locked: status=%d\n", __func__, status);
160 state->frequency = frequency; /* cache successful state */ 160 state->frequency = frequency; /* cache successful state */
161 } else { 161 } else {
162 printk("%s: No Phase lock: status=%d\n", __func__, status); 162 pr_debug("%s: No Phase lock: status=%d\n", __func__, status);
163 } 163 }
164 } else { 164 } else {
165 printk("%s: Unknown parameter (param=%d)\n", __func__, param); 165 pr_err("%s: Unknown parameter (param=%d)\n", __func__, param);
166 return -EINVAL; 166 return -EINVAL;
167 } 167 }
168 168
@@ -214,7 +214,7 @@ struct dvb_frontend *tda8261_attach(struct dvb_frontend *fe,
214 214
215// printk("%s: Attaching %s TDA8261 8PSK/QPSK tuner\n", 215// printk("%s: Attaching %s TDA8261 8PSK/QPSK tuner\n",
216// __func__, fe->ops.tuner_ops.tuner_name); 216// __func__, fe->ops.tuner_ops.tuner_name);
217 printk("%s: Attaching TDA8261 8PSK/QPSK tuner\n", __func__); 217 pr_info("%s: Attaching TDA8261 8PSK/QPSK tuner\n", __func__);
218 218
219 return fe; 219 return fe;
220 220