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

Commit c428f35a authored by Daniel Vetter's avatar Daniel Vetter
Browse files

fb: Flatten control flow in fb_set_var 



Instead of wiring almost everything down to the very last line using
goto soup (but not consistently, where would the fun be otherwise)
drop out early when checks fail. This allows us to flatten the huge
indent levels to just 1.

Aside: If a driver doesn't set ->fb_check_var, then FB_ACTIVATE_NOW
does nothing. This bug exists ever since this code was extracted as a
common helper in 2002, hence I decided against fixing it. Everyone
just better have a fb_check_var to make sure things work correctly.

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
Reviewed-by: default avatarSam Ravnborg <sam@ravnborg.org>
Reviewed-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Cc: "Michał Mirosław" <mirq-linux@rere.qmqm.pl>
Cc: Peter Rosin <peda@axentia.se>
Cc: Hans de Goede <hdegoede@redhat.com>
Cc: Mikulas Patocka <mpatocka@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190528090304.9388-28-daniel.vetter@ffwll.ch
parent 36676173

drivers/video/fbdev/core/fbmem.c

+63 −63
Original line number Diff line number Diff line
@@ -954,6 +954,9 @@ fb_set_var(struct fb_info *info, struct fb_var_screeninfo *var) 
{

	int flags = info->flags;

	int ret = 0;

	u32 activate;

	struct fb_var_screeninfo old_var;

	struct fb_videomode mode;



	if (var->activate & FB_ACTIVATE_INV_MODE) {

		struct fb_videomode mode1, mode2;
@@ -970,13 +973,14 @@ fb_set_var(struct fb_info *info, struct fb_var_screeninfo *var) 
			fb_delete_videomode(&mode1, &info->modelist);





		ret = (ret) ? -EINVAL : 0;

		goto done;

		return ret ? -EINVAL : 0;

	}



	if ((var->activate & FB_ACTIVATE_FORCE) ||

	    memcmp(&info->var, var, sizeof(struct fb_var_screeninfo))) {

		u32 activate = var->activate;

	if (!(var->activate & FB_ACTIVATE_FORCE) &&

	    !memcmp(&info->var, var, sizeof(struct fb_var_screeninfo)))

		return 0;



	activate = var->activate;



	/* When using FOURCC mode, make sure the red, green, blue and

	 * transp fields are set to 0.
@@ -994,23 +998,22 @@ fb_set_var(struct fb_info *info, struct fb_var_screeninfo *var) 


	if (!info->fbops->fb_check_var) {

		*var = info->var;

			goto done;

		return 0;

	}



	ret = info->fbops->fb_check_var(var, info);



	if (ret)

			goto done;

		return ret;



		if ((var->activate & FB_ACTIVATE_MASK) == FB_ACTIVATE_NOW) {

			struct fb_var_screeninfo old_var;

			struct fb_videomode mode;

	if ((var->activate & FB_ACTIVATE_MASK) != FB_ACTIVATE_NOW)

		return 0;



	if (info->fbops->fb_get_caps) {

		ret = fb_check_caps(info, var, activate);



		if (ret)

					goto done;

			return ret;

	}



	old_var = info->var;
@@ -1024,7 +1027,7 @@ fb_set_var(struct fb_info *info, struct fb_var_screeninfo *var) 
			printk(KERN_WARNING "detected "

				"fb_set_par error, "

				"error code: %d\n", ret);

					goto done;

			return ret;

		}

	}
@@ -1047,10 +1050,7 @@ fb_set_var(struct fb_info *info, struct fb_var_screeninfo *var) 
		event.data = &mode;

		fb_notifier_call_chain(evnt, &event);

	}

		}

	}



 done:

	return ret;

}

EXPORT_SYMBOL(fb_set_var);