Commit 87be8932 authored Oct 04, 2012 by Geert Uytterhoeven Committed by Linus Torvalds Oct 06, 2012

frv: kill used but uninitialized variable



Commit 6afe1a1f ("PM: Remove legacy PM") removed the initialization
of retval, causing:

  arch/frv/kernel/pm.c: In function 'sysctl_pm_do_suspend':
  arch/frv/kernel/pm.c:165:5: warning: 'retval' may be used uninitialized in this function [-Wuninitialized]

Remove the variable completely to fix this, and convert to a proper
switch (...) { ... } construct to improve readability.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: David Howells <dhowells@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 8f243af4

arch/frv/kernel/pm.c

+9 −10

Original line number	Diff line number	Diff line
		@@ -153,23 +153,22 @@ static int user_atoi(char __user *ubuf, size_t len)
		static int sysctl_pm_do_suspend(ctl_table *ctl, int write,
		void __user buffer, size_t lenp, loff_t *fpos)
		{
		int retval, mode;
		int mode;

		if (*lenp <= 0)
		return -EIO;

		mode = user_atoi(buffer, *lenp);
		if ((mode != 1) && (mode != 5))
		return -EINVAL;
		switch (mode) {
		case 1:
		return pm_do_suspend();

		if (retval == 0) {
		if (mode == 5)
		retval = pm_do_bus_sleep();
		else
		retval = pm_do_suspend();
		}
		case 5:
		return pm_do_bus_sleep();

		return retval;
		default:
		return -EINVAL;
		}
		}

		static int try_set_cmode(int new_cmode)