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

Commit 0834cc77 authored by Jeff Dike's avatar Jeff Dike Committed by Linus Torvalds
Browse files

[PATCH] uml: use ARRAY_SIZE 



This patch replaces instances of "sizeof(foo)/sizeof(foo[0])" with
ARRAY_SIZE(foo), which expands to the same thing.

Signed-off-by: default avatarJeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent d50084a2

arch/um/drivers/ssl.c

+7 −13
Original line number Diff line number Diff line
@@ -84,21 +84,18 @@ static struct lines lines = LINES_INIT(NR_PORTS); 


static int ssl_config(char *str)

{

	return line_config(serial_lines,

			   sizeof(serial_lines)/sizeof(serial_lines[0]), str);

	return line_config(serial_lines, ARRAY_SIZE(serial_lines), str);

}



static int ssl_get_config(char *dev, char *str, int size, char **error_out)

{

	return line_get_config(dev, serial_lines,

			       sizeof(serial_lines)/sizeof(serial_lines[0]),

			       str, size, error_out);

	return line_get_config(dev, serial_lines, ARRAY_SIZE(serial_lines), str,

			       size, error_out);

}



static int ssl_remove(int n)

{

	return line_remove(serial_lines,

			   sizeof(serial_lines)/sizeof(serial_lines[0]), n);

	return line_remove(serial_lines, ARRAY_SIZE(serial_lines), n);

}



int ssl_open(struct tty_struct *tty, struct file *filp)
@@ -205,7 +202,7 @@ int ssl_init(void) 
					 serial_lines,

					 ARRAY_SIZE(serial_lines));



	lines_init(serial_lines, sizeof(serial_lines)/sizeof(serial_lines[0]));

	lines_init(serial_lines, ARRAY_SIZE(serial_lines));



	new_title = add_xterm_umid(opts.xterm_title);

	if (new_title != NULL)
@@ -221,16 +218,13 @@ static void ssl_exit(void) 
{

	if (!ssl_init_done)

		return;

	close_lines(serial_lines,

		    sizeof(serial_lines)/sizeof(serial_lines[0]));

	close_lines(serial_lines, ARRAY_SIZE(serial_lines));

}

__uml_exitcall(ssl_exit);



static int ssl_chan_setup(char *str)

{

	return line_setup(serial_lines,

			  sizeof(serial_lines)/sizeof(serial_lines[0]),

			  str, 1);

	return line_setup(serial_lines, ARRAY_SIZE(serial_lines), str, 1);

}



__setup("ssl", ssl_chan_setup);

arch/um/drivers/stdio_console.c

+6 −7
Original line number Diff line number Diff line
@@ -91,18 +91,17 @@ struct line vts[MAX_TTYS] = { LINE_INIT(CONFIG_CON_ZERO_CHAN, &driver), 


static int con_config(char *str)

{

	return line_config(vts, sizeof(vts)/sizeof(vts[0]), str);

	return line_config(vts, ARRAY_SIZE(vts), str);

}



static int con_get_config(char *dev, char *str, int size, char **error_out)

{

	return line_get_config(dev, vts, sizeof(vts)/sizeof(vts[0]), str,

			       size, error_out);

	return line_get_config(dev, vts, ARRAY_SIZE(vts), str, size, error_out);

}



static int con_remove(int n)

{

	return line_remove(vts, sizeof(vts)/sizeof(vts[0]), n);

	return line_remove(vts, ARRAY_SIZE(vts), n);

}



static int con_open(struct tty_struct *tty, struct file *filp)
@@ -170,7 +169,7 @@ int stdio_init(void) 
		return -1;

	printk(KERN_INFO "Initialized stdio console driver\n");



	lines_init(vts, sizeof(vts)/sizeof(vts[0]));

	lines_init(vts, ARRAY_SIZE(vts));



	new_title = add_xterm_umid(opts.xterm_title);

	if(new_title != NULL)
@@ -186,13 +185,13 @@ static void console_exit(void) 
{

	if (!con_init_done)

		return;

	close_lines(vts, sizeof(vts)/sizeof(vts[0]));

	close_lines(vts, ARRAY_SIZE(vts));

}

__uml_exitcall(console_exit);



static int console_chan_setup(char *str)

{

	return line_setup(vts, sizeof(vts)/sizeof(vts[0]), str, 1);

	return line_setup(vts, ARRAY_SIZE(vts), str, 1);

}

__setup("con", console_chan_setup);

__channel_help(console_chan_setup, "con");