diff options
| author | Michal Simek <michal.simek@xilinx.com> | 2018-01-26 15:17:04 +0300 |
|---|---|---|
| committer | Michal Simek <michal.simek@xilinx.com> | 2018-03-23 11:34:42 +0300 |
| commit | cda1e3fb0f390b3cc4df1be25c0d6557e81ec3bb (patch) | |
| tree | c431267e84d257c490c05458acee3de9694f36dc /drivers/fpga | |
| parent | 734bf172e9db4e3afb24772c368bbb7632bf3921 (diff) | |
| download | u-boot-cda1e3fb0f390b3cc4df1be25c0d6557e81ec3bb.tar.xz | |
fpga: Simplify error path in fpga_add
Check !desc earlier to simplify code.
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Acked-by: Simon Goldschmidt <sgoldschmidt@de.pepperl-fuchs.com>
Reviewed-by: Simon Goldschmidt <sgoldschmidt@de.pepperl-fuchs.com>
Diffstat (limited to 'drivers/fpga')
| -rw-r--r-- | drivers/fpga/fpga.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/drivers/fpga/fpga.c b/drivers/fpga/fpga.c index 6aead27f16..ac01612d75 100644 --- a/drivers/fpga/fpga.c +++ b/drivers/fpga/fpga.c @@ -148,20 +148,21 @@ int fpga_add(fpga_type devtype, void *desc) { int devnum = FPGA_INVALID_DEVICE; + if (!desc) { + printf("%s: NULL device descriptor\n", __func__); + return devnum; + } + if (next_desc < 0) { printf("%s: FPGA support not initialized!\n", __func__); } else if ((devtype > fpga_min_type) && (devtype < fpga_undefined)) { - if (desc) { - if (next_desc < CONFIG_MAX_FPGA_DEVICES) { - devnum = next_desc; - desc_table[next_desc].devtype = devtype; - desc_table[next_desc++].devdesc = desc; - } else { - printf("%s: Exceeded Max FPGA device count\n", - __func__); - } + if (next_desc < CONFIG_MAX_FPGA_DEVICES) { + devnum = next_desc; + desc_table[next_desc].devtype = devtype; + desc_table[next_desc++].devdesc = desc; } else { - printf("%s: NULL device descriptor\n", __func__); + printf("%s: Exceeded Max FPGA device count\n", + __func__); } } else { printf("%s: Unsupported FPGA type %d\n", __func__, devtype); |