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

Commit 008d2d11 authored by Michael Holzheu's avatar Michael Holzheu Committed by Martin Schwidefsky
Browse files

[S390] ipl: Improve checking logic and remove switch defaults. 



A code analysis tool reported two warnings:
"The expression `ipl_info.type == IPL_TYPE_FCP' is true whenever evaluated."
and "Default is not possible". This patch improves the corresponding if
statement logic and removes the unnecessary switch defaults.

Signed-off-by: default avatarMichael Holzheu <holzheu@linux.vnet.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 58ace9f2

arch/s390/kernel/ipl.c

+6 −7
Original line number Diff line number Diff line
@@ -966,7 +966,6 @@ static void reipl_run(struct shutdown_trigger *trigger) 
		diag308(DIAG308_IPL, NULL);

		break;

	case REIPL_METHOD_FCP_DUMP:

	default:

		break;

	}

	disabled_wait((unsigned long) __builtin_return_address(0));
@@ -1075,10 +1074,12 @@ static int __init reipl_fcp_init(void) 
{

	int rc;



	if ((!diag308_set_works) && (ipl_info.type != IPL_TYPE_FCP))

		return 0;

	if ((!diag308_set_works) && (ipl_info.type == IPL_TYPE_FCP))

	if (!diag308_set_works) {

		if (ipl_info.type == IPL_TYPE_FCP)

			make_attrs_ro(reipl_fcp_attrs);

		else

			return 0;

	}



	reipl_block_fcp = (void *) get_zeroed_page(GFP_KERNEL);

	if (!reipl_block_fcp)
@@ -1259,7 +1260,6 @@ static void dump_run(struct shutdown_trigger *trigger) 
		diag308(DIAG308_DUMP, NULL);

		break;

	case DUMP_METHOD_NONE:

	default:

		return;

	}

	printk(KERN_EMERG "Dump failed!\n");
@@ -1746,7 +1746,6 @@ void __init setup_ipl(void) 
			sizeof(ipl_info.data.nss.name));

		break;

	case IPL_TYPE_UNKNOWN:

	default:

		/* We have no info to copy */

		break;

	}