openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

V4L/DVB (3571): Printk warning fixes 

On ppc64, u64 is `unsigned long'
drivers/media/video/v4l2-common.c: In function `v4l_printk_ioctl_arg':
drivers/media/video/v4l2-common.c:486: warning: cast from pointer to integer of different size
drivers/media/video/v4l2-common.c:580: warning: long long int format, v4l2_std_id arg (arg 8)
drivers/media/video/v4l2-common.c:625: warning: long long int format, v4l2_std_id arg (arg 8)
drivers/media/video/v4l2-common.c:693: warning: long long int format, v4l2_std_id arg (arg 4)
drivers/media/video/v4l2-common.c:910: warning: long long unsigned int format, long unsigned int a$

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
Andrew Morton 2006-03-22 15:01:59 -03:00 committed by Mauro Carvalho Chehab
parent 2ae151911e
commit 5245953e18
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/media/video/v4l2-common.c
View File

@ -481,9 +481,9 @@ void v4l_printk_ioctl_arg(char *s,unsigned int cmd, void *arg)
prt_names(p->memory,v4l2_memory_names),
p->m.userptr);
printk ("%s: timecode= %02d:%02d:%02d type=%d, "
"flags=0x%08d, frames=%d, userbits=0x%08x\n",
"flags=0x%08d, frames=%d, userbits=0x%p",
s,tc->hours,tc->minutes,tc->seconds,
tc->type, tc->flags, tc->frames, (__u32) tc->userbits);
tc->type, tc->flags, tc->frames, tc->userbits);
break;
}
case VIDIOC_QUERYCAP:
@ -574,9 +574,10 @@ void v4l_printk_ioctl_arg(char *s,unsigned int cmd, void *arg)
{
struct v4l2_input *p=arg;
printk ("%s: index=%d, name=%s, type=%d, audioset=%d, "
"tuner=%d, std=%lld, status=%d\n", s,
"tuner=%d, std=%Ld, status=%d\n", s,
p->index,p->name,p->type,p->audioset,
p->tuner,p->std,
p->tuner,
(unsigned long long)p->std,
p->status);
break;
}
@ -620,9 +621,10 @@ void v4l_printk_ioctl_arg(char *s,unsigned int cmd, void *arg)
{
struct v4l2_output *p=arg;
printk ("%s: index=%d, name=%s,type=%d, audioset=%d, "
"modulator=%d, std=%lld\n",
"modulator=%d, std=%Ld\n",
s,p->index,p->name,p->type,p->audioset,
p->modulator,p->std);
p->modulator,
(unsigned long long)p->std);
break;
}
case VIDIOC_QUERYCTRL:
@ -686,8 +688,9 @@ void v4l_printk_ioctl_arg(char *s,unsigned int cmd, void *arg)
case VIDIOC_ENUMSTD:
{
struct v4l2_standard *p=arg;
printk ("%s: index=%d, id=%lld, name=%s, fps=%d/%d, framelines=%d\n", s,
p->index, p->id, p->name,
printk ("%s: index=%d, id=%Ld, name=%s, fps=%d/%d, "
"framelines=%d\n", s, p->index,
(unsigned long long)p->id, p->name,
p->frameperiod.numerator,
p->frameperiod.denominator,
p->framelines);
@ -907,7 +910,7 @@ void v4l_printk_ioctl_arg(char *s,unsigned int cmd, void *arg)
{
v4l2_std_id *p=arg;
printk ("%s: value=%llu\n", s, *p);
printk ("%s: value=%Lu\n", s, (unsigned long long)*p);
break;
}
}