AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

[media] dvb_filter: use KERN_CONT where needed

Browse Source 
Some continuation messages are not using KERN_CONT.

Since commit 563873318d ("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>
This commit is contained in:
Mauro Carvalho Chehab 2016-10-14 07:11:07 -03:00
parent 54e0443b47
commit 9a9689cf6d
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/media/pci/ttpci/dvb_filter.c
View File

@ -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, {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}}; 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) int dvb_filter_get_ac3info(u8 *mbuf, int count, struct dvb_audio_info *ai, int pr)
{ {
u8 *headr; 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 (!found) return -1;
if (pr) if (pr)
printk("Audiostream: AC3"); printk(KERN_DEBUG "Audiostream: AC3");
ai->off = c; ai->off = c;
if (c+5 >= count) return -1; 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; ai->bit_rate = ac3_bitrates[frame >> 1]*1000;
if (pr) 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; ai->frequency = (headr[2] & 0xc0 ) >> 6;
fr = (headr[2] & 0xc0 ) >> 6; fr = (headr[2] & 0xc0 ) >> 6;
ai->frequency = freq[fr]*100; 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]; ai->framesize = ac3_frames[fr][frame >> 1];
if ((frame & 1) && (fr == 1)) ai->framesize++; if ((frame & 1) && (fr == 1)) ai->framesize++;
ai->framesize = ai->framesize << 1; 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; return 0;
} }