redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

[media] bdisp-debug: don't try to divide by s64

Browse source 
There are several warnings there, on some architectures, related
to dividing a s32 by a s64 value:

drivers/media/platform/sti/bdisp/bdisp-debug.c:594: warning: comparison of distinct pointer types lacks a cast
drivers/media/platform/sti/bdisp/bdisp-debug.c:594: warning: right shift count >= width of type
drivers/media/platform/sti/bdisp/bdisp-debug.c:594: warning: passing argument 1 of '__div64_32' from incompatible pointer type
drivers/media/platform/sti/bdisp/bdisp-debug.c:595: warning: comparison of distinct pointer types lacks a cast
drivers/media/platform/sti/bdisp/bdisp-debug.c:595: warning: right shift count >= width of type
drivers/media/platform/sti/bdisp/bdisp-debug.c:595: warning: passing argument 1 of '__div64_32' from incompatible pointer type  CC [M]  drivers/media/tuners/mt2060.o
drivers/media/platform/sti/bdisp/bdisp-debug.c:596: warning: comparison of distinct pointer types lacks a cast
drivers/media/platform/sti/bdisp/bdisp-debug.c:596: warning: right shift count >= width of type
drivers/media/platform/sti/bdisp/bdisp-debug.c:596: warning: passing argument 1 of '__div64_32' from incompatible pointer type
drivers/media/platform/sti/bdisp/bdisp-debug.c:597: warning: comparison of distinct pointer types lacks a cast
drivers/media/platform/sti/bdisp/bdisp-debug.c:597: warning: right shift count >= width of type
drivers/media/platform/sti/bdisp/bdisp-debug.c:597: warning: passing argument 1 of '__div64_32' from incompatible pointer type

That doesn't make much sense. What the driver is actually trying
to do is to divide one second by a value. So, check the range
before dividing. That warrants the right result and will remove
the warnings on non-64 bits archs.

Also fixes this warning:
drivers/media/platform/sti/bdisp/bdisp-debug.c:588: warning: comparison of distinct pointer types lacks a cast

by using div64_s64() instead of calling do_div() directly.

Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
This commit is contained in:
Mauro Carvalho Chehab 2015-06-10 14:37:16 -03:00
parent bc5e66bd25
commit 82d229cde0
1 changed files with 21 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
drivers/media/platform/sti/bdisp/bdisp-debug.c
View file

@ -572,6 +572,8 @@ static int bdisp_dbg_regs(struct seq_file *s, void *data)
return 0; return 0;
} }
#define SECOND 1000000
static int bdisp_dbg_perf(struct seq_file *s, void *data) static int bdisp_dbg_perf(struct seq_file *s, void *data)
{ {
struct bdisp_dev *bdisp = s->private; struct bdisp_dev *bdisp = s->private;
@ -584,17 +586,26 @@ static int bdisp_dbg_perf(struct seq_file *s, void *data)
return 0; return 0;
} }
avg_time_us = bdisp->dbg.tot_duration; avg_time_us = div64_s64(bdisp->dbg.tot_duration, request->nb_req);
do_div(avg_time_us, request->nb_req); if (avg_time_us > SECOND)
avg_fps = 0;
else
avg_fps = SECOND / (s32)avg_time_us;
avg_fps = 1000000; if (bdisp->dbg.min_duration > SECOND)
min_fps = 1000000; min_fps = 0;
max_fps = 1000000; else
last_fps = 1000000; min_fps = SECOND / (s32)bdisp->dbg.min_duration;
do_div(avg_fps, avg_time_us);
do_div(min_fps, bdisp->dbg.min_duration); if (bdisp->dbg.max_duration > SECOND)
do_div(max_fps, bdisp->dbg.max_duration); max_fps = 0;
do_div(last_fps, bdisp->dbg.last_duration); else
max_fps = SECOND / (s32)bdisp->dbg.max_duration;
if (bdisp->dbg.last_duration > SECOND)
last_fps = 0;
else
last_fps = SECOND / (s32)bdisp->dbg.last_duration;
seq_printf(s, "HW processing (%d requests):\n", request->nb_req); seq_printf(s, "HW processing (%d requests):\n", request->nb_req);
seq_printf(s, " Average: %5lld us (%3d fps)\n", seq_printf(s, " Average: %5lld us (%3d fps)\n",