diff options
author | Geert Uytterhoeven <geert@linux-m68k.org> | 2008-10-13 15:58:58 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-14 13:23:27 -0400 |
commit | 7477fb6fbc339469ea945e007f3f7b3bb13b25f7 (patch) | |
tree | 45dbb6098740820c6cee67f61bef19df59fc3e9b /drivers | |
parent | 998aaf01c6f6f3dffc1ea9e7b20b131e38fdbc78 (diff) |
HP input: kill warnings due to suseconds_t differences
Kill compiler warnings related to printf() formats in the input drivers for
various HP9000 machines, which are shared between PA-RISC (suseconds_t is int)
and m68k (suseconds_t is long). As both are 32-bit, it's safe to cast to int.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Acked-by: Helge Deller <deller@gmx.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/input/misc/hp_sdc_rtc.c | 10 | ||||
-rw-r--r-- | drivers/input/serio/hp_sdc.c | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/drivers/input/misc/hp_sdc_rtc.c b/drivers/input/misc/hp_sdc_rtc.c index daa9d4220331..82ec6b1b6467 100644 --- a/drivers/input/misc/hp_sdc_rtc.c +++ b/drivers/input/misc/hp_sdc_rtc.c | |||
@@ -458,35 +458,35 @@ static int hp_sdc_rtc_proc_output (char *buf) | |||
458 | p += sprintf(p, "i8042 rtc\t: READ FAILED!\n"); | 458 | p += sprintf(p, "i8042 rtc\t: READ FAILED!\n"); |
459 | } else { | 459 | } else { |
460 | p += sprintf(p, "i8042 rtc\t: %ld.%02d seconds\n", | 460 | p += sprintf(p, "i8042 rtc\t: %ld.%02d seconds\n", |
461 | tv.tv_sec, tv.tv_usec/1000); | 461 | tv.tv_sec, (int)tv.tv_usec/1000); |
462 | } | 462 | } |
463 | 463 | ||
464 | if (hp_sdc_rtc_read_fhs(&tv)) { | 464 | if (hp_sdc_rtc_read_fhs(&tv)) { |
465 | p += sprintf(p, "handshake\t: READ FAILED!\n"); | 465 | p += sprintf(p, "handshake\t: READ FAILED!\n"); |
466 | } else { | 466 | } else { |
467 | p += sprintf(p, "handshake\t: %ld.%02d seconds\n", | 467 | p += sprintf(p, "handshake\t: %ld.%02d seconds\n", |
468 | tv.tv_sec, tv.tv_usec/1000); | 468 | tv.tv_sec, (int)tv.tv_usec/1000); |
469 | } | 469 | } |
470 | 470 | ||
471 | if (hp_sdc_rtc_read_mt(&tv)) { | 471 | if (hp_sdc_rtc_read_mt(&tv)) { |
472 | p += sprintf(p, "alarm\t\t: READ FAILED!\n"); | 472 | p += sprintf(p, "alarm\t\t: READ FAILED!\n"); |
473 | } else { | 473 | } else { |
474 | p += sprintf(p, "alarm\t\t: %ld.%02d seconds\n", | 474 | p += sprintf(p, "alarm\t\t: %ld.%02d seconds\n", |
475 | tv.tv_sec, tv.tv_usec/1000); | 475 | tv.tv_sec, (int)tv.tv_usec/1000); |
476 | } | 476 | } |
477 | 477 | ||
478 | if (hp_sdc_rtc_read_dt(&tv)) { | 478 | if (hp_sdc_rtc_read_dt(&tv)) { |
479 | p += sprintf(p, "delay\t\t: READ FAILED!\n"); | 479 | p += sprintf(p, "delay\t\t: READ FAILED!\n"); |
480 | } else { | 480 | } else { |
481 | p += sprintf(p, "delay\t\t: %ld.%02d seconds\n", | 481 | p += sprintf(p, "delay\t\t: %ld.%02d seconds\n", |
482 | tv.tv_sec, tv.tv_usec/1000); | 482 | tv.tv_sec, (int)tv.tv_usec/1000); |
483 | } | 483 | } |
484 | 484 | ||
485 | if (hp_sdc_rtc_read_ct(&tv)) { | 485 | if (hp_sdc_rtc_read_ct(&tv)) { |
486 | p += sprintf(p, "periodic\t: READ FAILED!\n"); | 486 | p += sprintf(p, "periodic\t: READ FAILED!\n"); |
487 | } else { | 487 | } else { |
488 | p += sprintf(p, "periodic\t: %ld.%02d seconds\n", | 488 | p += sprintf(p, "periodic\t: %ld.%02d seconds\n", |
489 | tv.tv_sec, tv.tv_usec/1000); | 489 | tv.tv_sec, (int)tv.tv_usec/1000); |
490 | } | 490 | } |
491 | 491 | ||
492 | p += sprintf(p, | 492 | p += sprintf(p, |
diff --git a/drivers/input/serio/hp_sdc.c b/drivers/input/serio/hp_sdc.c index 0d395979b2d1..bfe49243f38b 100644 --- a/drivers/input/serio/hp_sdc.c +++ b/drivers/input/serio/hp_sdc.c | |||
@@ -323,7 +323,7 @@ static void hp_sdc_tasklet(unsigned long foo) | |||
323 | * it back to the application. and be less verbose. | 323 | * it back to the application. and be less verbose. |
324 | */ | 324 | */ |
325 | printk(KERN_WARNING PREFIX "read timeout (%ius)!\n", | 325 | printk(KERN_WARNING PREFIX "read timeout (%ius)!\n", |
326 | tv.tv_usec - hp_sdc.rtv.tv_usec); | 326 | (int)(tv.tv_usec - hp_sdc.rtv.tv_usec)); |
327 | curr->idx += hp_sdc.rqty; | 327 | curr->idx += hp_sdc.rqty; |
328 | hp_sdc.rqty = 0; | 328 | hp_sdc.rqty = 0; |
329 | tmp = curr->seq[curr->actidx]; | 329 | tmp = curr->seq[curr->actidx]; |