Skip to content

Commit

Permalink
HP input: kill warnings due to suseconds_t differences
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Geert Uytterhoeven authored and Linus Torvalds committed Oct 14, 2008
1 parent 998aaf0 commit 7477fb6
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
10 changes: 5 additions & 5 deletions drivers/input/misc/hp_sdc_rtc.c
Original file line number Diff line number Diff line change
Expand Up @@ -458,35 +458,35 @@ static int hp_sdc_rtc_proc_output (char *buf)
p += sprintf(p, "i8042 rtc\t: READ FAILED!\n");
} else {
p += sprintf(p, "i8042 rtc\t: %ld.%02d seconds\n",
tv.tv_sec, tv.tv_usec/1000);
tv.tv_sec, (int)tv.tv_usec/1000);
}

if (hp_sdc_rtc_read_fhs(&tv)) {
p += sprintf(p, "handshake\t: READ FAILED!\n");
} else {
p += sprintf(p, "handshake\t: %ld.%02d seconds\n",
tv.tv_sec, tv.tv_usec/1000);
tv.tv_sec, (int)tv.tv_usec/1000);
}

if (hp_sdc_rtc_read_mt(&tv)) {
p += sprintf(p, "alarm\t\t: READ FAILED!\n");
} else {
p += sprintf(p, "alarm\t\t: %ld.%02d seconds\n",
tv.tv_sec, tv.tv_usec/1000);
tv.tv_sec, (int)tv.tv_usec/1000);
}

if (hp_sdc_rtc_read_dt(&tv)) {
p += sprintf(p, "delay\t\t: READ FAILED!\n");
} else {
p += sprintf(p, "delay\t\t: %ld.%02d seconds\n",
tv.tv_sec, tv.tv_usec/1000);
tv.tv_sec, (int)tv.tv_usec/1000);
}

if (hp_sdc_rtc_read_ct(&tv)) {
p += sprintf(p, "periodic\t: READ FAILED!\n");
} else {
p += sprintf(p, "periodic\t: %ld.%02d seconds\n",
tv.tv_sec, tv.tv_usec/1000);
tv.tv_sec, (int)tv.tv_usec/1000);
}

p += sprintf(p,
Expand Down
2 changes: 1 addition & 1 deletion drivers/input/serio/hp_sdc.c
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,7 @@ static void hp_sdc_tasklet(unsigned long foo)
* it back to the application. and be less verbose.
*/
printk(KERN_WARNING PREFIX "read timeout (%ius)!\n",
tv.tv_usec - hp_sdc.rtv.tv_usec);
(int)(tv.tv_usec - hp_sdc.rtv.tv_usec));
curr->idx += hp_sdc.rqty;
hp_sdc.rqty = 0;
tmp = curr->seq[curr->actidx];
Expand Down

0 comments on commit 7477fb6

Please sign in to comment.