Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7477fb6f authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Linus Torvalds
Browse files

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: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Acked-by: default avatarHelge Deller <deller@gmx.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 998aaf01

drivers/input/misc/hp_sdc_rtc.c

+5 −5
Original line number Diff line number Diff line
@@ -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,

drivers/input/serio/hp_sdc.c

+1 −1
Original line number Diff line number Diff line
@@ -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];