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
...@@ -966,7 +966,6 @@ static void reipl_run(struct shutdown_trigger *trigger) ...@@ -966,7 +966,6 @@ static void reipl_run(struct shutdown_trigger *trigger)
diag308(DIAG308_IPL, NULL); diag308(DIAG308_IPL, NULL);
break; break;
case REIPL_METHOD_FCP_DUMP: case REIPL_METHOD_FCP_DUMP:
default:
break; break;
} }
disabled_wait((unsigned long) __builtin_return_address(0)); disabled_wait((unsigned long) __builtin_return_address(0));
...@@ -1075,10 +1074,12 @@ static int __init reipl_fcp_init(void) ...@@ -1075,10 +1074,12 @@ static int __init reipl_fcp_init(void)
{ {
int rc; int rc;
if ((!diag308_set_works) && (ipl_info.type != IPL_TYPE_FCP)) if (!diag308_set_works) {
return 0; if (ipl_info.type == IPL_TYPE_FCP)
if ((!diag308_set_works) && (ipl_info.type == IPL_TYPE_FCP)) make_attrs_ro(reipl_fcp_attrs);
make_attrs_ro(reipl_fcp_attrs); else
return 0;
}
reipl_block_fcp = (void *) get_zeroed_page(GFP_KERNEL); reipl_block_fcp = (void *) get_zeroed_page(GFP_KERNEL);
if (!reipl_block_fcp) if (!reipl_block_fcp)
...@@ -1259,7 +1260,6 @@ static void dump_run(struct shutdown_trigger *trigger) ...@@ -1259,7 +1260,6 @@ static void dump_run(struct shutdown_trigger *trigger)
diag308(DIAG308_DUMP, NULL); diag308(DIAG308_DUMP, NULL);
break; break;
case DUMP_METHOD_NONE: case DUMP_METHOD_NONE:
default:
return; return;
} }
printk(KERN_EMERG "Dump failed!\n"); printk(KERN_EMERG "Dump failed!\n");
...@@ -1746,7 +1746,6 @@ void __init setup_ipl(void) ...@@ -1746,7 +1746,6 @@ void __init setup_ipl(void)
sizeof(ipl_info.data.nss.name)); sizeof(ipl_info.data.nss.name));
break; break;
case IPL_TYPE_UNKNOWN: case IPL_TYPE_UNKNOWN:
default:
/* We have no info to copy */ /* We have no info to copy */
break; break;
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment