[U-Boot] [PATCH 28/51] fpga: altera: Clean up altera_validate function
Marek Vasut
marex at denx.de
Sun Sep 21 15:12:09 CEST 2014
Boldly go, where no programmer has gone before and just clean up
the indentation mayhem. No functional change.
Signed-off-by: Marek Vasut <marex at denx.de>
Cc: Chin Liang See <clsee at altera.com>
Cc: Dinh Nguyen <dinguyen at altera.com>
Cc: Albert Aribaud <albert.u.boot at aribaud.net>
Cc: Tom Rini <trini at ti.com>
Cc: Wolfgang Denk <wd at denx.de>
Cc: Pavel Machek <pavel at denx.de>
---
drivers/fpga/altera.c | 43 +++++++++++++++++++++----------------------
1 file changed, 21 insertions(+), 22 deletions(-)
diff --git a/drivers/fpga/altera.c b/drivers/fpga/altera.c
index ed3f0c8..6394afe 100644
--- a/drivers/fpga/altera.c
+++ b/drivers/fpga/altera.c
@@ -195,32 +195,31 @@ int altera_info( Altera_desc *desc )
/* ------------------------------------------------------------------------- */
-static int altera_validate (Altera_desc * desc, const char *fn)
+static int altera_validate(Altera_desc *desc, const char *fn)
{
- int ret_val = false;
-
- if (desc) {
- if ((desc->family > min_altera_type) &&
- (desc->family < max_altera_type)) {
- if ((desc->iface > min_altera_iface_type) &&
- (desc->iface < max_altera_iface_type)) {
- if (desc->size) {
- ret_val = true;
- } else {
- printf("%s: NULL part size\n", fn);
- }
- } else {
- printf("%s: Invalid Interface type, %d\n",
- fn, desc->iface);
- }
- } else {
- printf("%s: Invalid family type, %d\n", fn, desc->family);
- }
- } else {
+ if (!desc) {
printf("%s: NULL descriptor!\n", fn);
+ return false;
}
- return ret_val;
+ if ((desc->family < min_altera_type) ||
+ (desc->family > max_altera_type)) {
+ printf("%s: Invalid family type, %d\n", fn, desc->family);
+ return false;
+ }
+
+ if ((desc->iface < min_altera_iface_type) ||
+ (desc->iface > max_altera_iface_type)) {
+ printf("%s: Invalid Interface type, %d\n", fn, desc->iface);
+ return false;
+ }
+
+ if (!desc->size) {
+ printf("%s: NULL part size\n", fn);
+ return false;
+ }
+
+ return true;
}
/* ------------------------------------------------------------------------- */
--
2.0.0
More information about the U-Boot
mailing list