diff options
| author | Mauro Carvalho Chehab <mchehab@s-opensource.com> | 2016-10-14 12:11:07 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@s-opensource.com> | 2016-10-21 12:44:56 +0200 |
| commit | 9a9689cf6d4dfb8b105946e20846ec20ea403bf9 (patch) | |
| tree | 8190491b32bb98bc4da9d8e1406ea8404582fd40 | |
| parent | [media] dvb_filter: get rid of dead code (diff) | |
| download | linux-9a9689cf6d4dfb8b105946e20846ec20ea403bf9.tar.xz linux-9a9689cf6d4dfb8b105946e20846ec20ea403bf9.zip | |
[media] dvb_filter: use KERN_CONT where needed
Some continuation messages are not using KERN_CONT.
Since commit 563873318d32 ("Merge branch 'printk-cleanups"),
this won't work as expected anymore. So, let's add KERN_CONT
to those lines.
While here, add missing log level annotations.
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
| -rw-r--r-- | drivers/media/pci/ttpci/dvb_filter.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/media/pci/ttpci/dvb_filter.c b/drivers/media/pci/ttpci/dvb_filter.c index 227f93e2ef10..b67127b67d4e 100644 --- a/drivers/media/pci/ttpci/dvb_filter.c +++ b/drivers/media/pci/ttpci/dvb_filter.c @@ -17,7 +17,6 @@ static u32 ac3_frames[3][32] = {96,120,144,168,192,240,288,336,384,480,576,672,768,960,1152,1344, 1536,1728,1920,0,0,0,0,0,0,0,0,0,0,0,0,0}}; - int dvb_filter_get_ac3info(u8 *mbuf, int count, struct dvb_audio_info *ai, int pr) { u8 *headr; @@ -38,7 +37,7 @@ int dvb_filter_get_ac3info(u8 *mbuf, int count, struct dvb_audio_info *ai, int p if (!found) return -1; if (pr) - printk("Audiostream: AC3"); + printk(KERN_DEBUG "Audiostream: AC3"); ai->off = c; if (c+5 >= count) return -1; @@ -50,19 +49,19 @@ int dvb_filter_get_ac3info(u8 *mbuf, int count, struct dvb_audio_info *ai, int p ai->bit_rate = ac3_bitrates[frame >> 1]*1000; if (pr) - printk(" BRate: %d kb/s", (int) ai->bit_rate/1000); + printk(KERN_CONT " BRate: %d kb/s", (int) ai->bit_rate/1000); ai->frequency = (headr[2] & 0xc0 ) >> 6; fr = (headr[2] & 0xc0 ) >> 6; ai->frequency = freq[fr]*100; - if (pr) printk (" Freq: %d Hz\n", (int) ai->frequency); - + if (pr) + printk(KERN_CONT " Freq: %d Hz\n", (int) ai->frequency); ai->framesize = ac3_frames[fr][frame >> 1]; if ((frame & 1) && (fr == 1)) ai->framesize++; ai->framesize = ai->framesize << 1; - if (pr) printk (" Framesize %d\n",(int) ai->framesize); - + if (pr) + printk(KERN_DEBUG " Framesize %d\n", (int) ai->framesize); return 0; } |