Commit 85af3705 authored by Jiri Slaby's avatar Jiri Slaby Committed by Greg Kroah-Hartman
Browse files

vt: use min() to limit intervals 



Instead of awkward ternary operator with comparison, use simple min()
for blankinterval and vesa_off_interval.

No functional change intended and "objdump -d" proves that.

Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
Link: https://lore.kernel.org/r/20200316065911.11024-1-jslaby@suse.cz


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b18d1c2e

drivers/tty/vt/vt.c

+2 −2
Original line number Diff line number Diff line
@@ -1927,7 +1927,7 @@ static void setterm_command(struct vc_data *vc) 
			update_attr(vc);

			break;

		case 9:	/* set blanking interval */

			blankinterval = ((vc->vc_par[1] < 60) ? vc->vc_par[1] : 60) * 60;

			blankinterval = min(vc->vc_par[1], 60U) * 60;

			poke_blanked_console();

			break;

		case 10: /* set bell frequency in Hz */
@@ -1951,7 +1951,7 @@ static void setterm_command(struct vc_data *vc) 
			poke_blanked_console();

			break;

		case 14: /* set vesa powerdown interval */

			vesa_off_interval = ((vc->vc_par[1] < 60) ? vc->vc_par[1] : 60) * 60 * HZ;

			vesa_off_interval = min(vc->vc_par[1], 60U) * 60 * HZ;

			break;

		case 15: /* activate the previous console */

			set_console(last_console);

CRA Git | Maintained and supported by SUSTech CRA and CCSE