Commit 34902b7f authored by Jiri Slaby's avatar Jiri Slaby Committed by Greg Kroah-Hartman
Browse files

tty: vt, get rid of weird source code flow 



Some code in vc_allocate is indented by 4 spaces. It is inside a
condition. Invert the condition and move the code to the first
indentation level (using \tab). And insert some empty lines to have
logical code blocks separated.

Then, instead of freeing in an 'if' false branch, use goto-error
label as fail path.

Maybe better to look at this patch with diff -w -b.

Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 182846a0

drivers/tty/vt/vt.c

+39 −31
Original line number Diff line number Diff line
@@ -760,13 +760,16 @@ static void visual_init(struct vc_data *vc, int num, int init) 


int vc_allocate(unsigned int currcons)	/* return 0 on success */

{

	struct vt_notifier_param param;

	struct vc_data *vc;



	WARN_CONSOLE_UNLOCKED();



	if (currcons >= MAX_NR_CONSOLES)

		return -ENXIO;

	if (!vc_cons[currcons].d) {

	    struct vc_data *vc;

	    struct vt_notifier_param param;



	if (vc_cons[currcons].d)

		return 0;



	/* due to the granularity of kmalloc, we waste some memory here */

	/* the alloc is done in two steps, to optimize the common situation
@@ -777,18 +780,19 @@ int vc_allocate(unsigned int currcons) /* return 0 on success */ 
	param.vc = vc = kzalloc(sizeof(struct vc_data), GFP_KERNEL);

	if (!vc)

		return -ENOMEM;



	vc_cons[currcons].d = vc;

	tty_port_init(&vc->port);

	INIT_WORK(&vc_cons[currcons].SAK_work, vc_SAK);



	visual_init(vc, currcons, 1);



	if (!*vc->vc_uni_pagedir_loc)

		con_set_default_unimap(vc);



	vc->vc_screenbuf = kmalloc(vc->vc_screenbuf_size, GFP_KERNEL);

	    if (!vc->vc_screenbuf) {

		kfree(vc);

		vc_cons[currcons].d = NULL;

		return -ENOMEM;

	    }

	if (!vc->vc_screenbuf)

		goto err_free;



	/* If no drivers have overridden us and the user didn't pass a

	   boot option, default to displaying the cursor */
@@ -798,8 +802,12 @@ int vc_allocate(unsigned int currcons) /* return 0 on success */ 
	vc_init(vc, vc->vc_rows, vc->vc_cols, 1);

	vcs_make_sysfs(currcons);

	atomic_notifier_call_chain(&vt_notifier_list, VT_ALLOCATE, &param);

	}



	return 0;

err_free:

	kfree(vc);

	vc_cons[currcons].d = NULL;

	return -ENOMEM;

}



static inline int resize_screen(struct vc_data *vc, int width, int height,

CRA Git | Maintained and supported by SUSTech CRA and CCSE