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

Commit 32fb3ca8 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds
Browse files

sx.c: fix printk warnings on sparc32 



drivers/char/sx.c: In function 'sx_set_real_termios':
drivers/char/sx.c:973: warning: format '%u' expects type 'unsigned int', but argument 2 has type 'long unsigned int'
drivers/char/sx.c:999: warning: format '%x' expects type 'unsigned int', but argument 2 has type 'tcflag_t'
drivers/char/sx.c:1012: warning: format '%x' expects type 'unsigned int', but argument 2 has type 'tcflag_t'

sparc32 seems to use weird types for its tty things.

[ Fine by me but this is ancient debug and most of the debug in sx just
  wants deleting eventually.  - Alan ]

Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Acked-by: default avatarAlan Cox <alan@redhat.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 3168cb98

drivers/char/sx.c

+6 −3
Original line number Diff line number Diff line
@@ -970,7 +970,8 @@ static int sx_set_real_termios(void *ptr) 
		sx_write_channel_byte(port, hi_mask, 0x1f);

		break;

	default:

		printk(KERN_INFO "sx: Invalid wordsize: %u\n", CFLAG & CSIZE);

		printk(KERN_INFO "sx: Invalid wordsize: %u\n",

			(unsigned int)CFLAG & CSIZE);

		break;

	}
@@ -997,7 +998,8 @@ static int sx_set_real_termios(void *ptr) 
		set_bit(TTY_HW_COOK_IN, &port->gs.tty->flags);

	}

	sx_dprintk(SX_DEBUG_TERMIOS, "iflags: %x(%d) ",

			port->gs.tty->termios->c_iflag, I_OTHER(port->gs.tty));

			(unsigned int)port->gs.tty->termios->c_iflag,

			I_OTHER(port->gs.tty));



/* Tell line discipline whether we will do output cooking.

 * If OPOST is set and no other output flags are set then we can do output
@@ -1010,7 +1012,8 @@ static int sx_set_real_termios(void *ptr) 
		clear_bit(TTY_HW_COOK_OUT, &port->gs.tty->flags);

	}

	sx_dprintk(SX_DEBUG_TERMIOS, "oflags: %x(%d)\n",

			port->gs.tty->termios->c_oflag, O_OTHER(port->gs.tty));

			(unsigned int)port->gs.tty->termios->c_oflag,

			O_OTHER(port->gs.tty));

	/* port->c_dcd = sx_get_CD (port); */

	func_exit();

	return 0;