aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/gs_fpgaboot
diff options
context:
space:
mode:
authorDevendra Naga <devendranaga4@gmail.com>2014-10-25 02:01:54 +0530
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-10-29 17:39:55 +0800
commit92bf93f1260402f17552f91599474bb9ead2a1b2 (patch)
treed854843cbd568f34f0c961a4bb4783c6948f165c /drivers/staging/gs_fpgaboot
parentstaging: rtl8712: remove unused variables (diff)
downloadlinux-dev-92bf93f1260402f17552f91599474bb9ead2a1b2.tar.xz
linux-dev-92bf93f1260402f17552f91599474bb9ead2a1b2.zip
staging: gs_fpgaboot: cleanup in gs_fpgaboot_init function
the error path is cleanup to return the correct (function call return value) error code. Signed-off-by: Devendra Naga <devendranaga4@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/gs_fpgaboot')
-rw-r--r--drivers/staging/gs_fpgaboot/gs_fpgaboot.c15
1 files changed, 5 insertions, 10 deletions
diff --git a/drivers/staging/gs_fpgaboot/gs_fpgaboot.c b/drivers/staging/gs_fpgaboot/gs_fpgaboot.c
index 0c18c4c311b4..bf2f898d3853 100644
--- a/drivers/staging/gs_fpgaboot/gs_fpgaboot.c
+++ b/drivers/staging/gs_fpgaboot/gs_fpgaboot.c
@@ -344,43 +344,38 @@ err_out1:
static int __init gs_fpgaboot_init(void)
{
- int err, r;
-
- r = -1;
+ int err;
pr_info("FPGA DOWNLOAD --->\n");
pr_info("FPGA image file name: %s\n", file);
err = init_driver();
- if (err != 0) {
+ if (err) {
pr_err("FPGA DRIVER INIT FAIL!!\n");
- return r;
+ return err;
}
err = xl_init_io();
if (err) {
pr_err("GPIO INIT FAIL!!\n");
- r = -1;
goto errout;
}
err = gs_fpgaboot();
if (err) {
pr_err("FPGA DOWNLOAD FAIL!!\n");
- r = -1;
goto errout;
}
pr_info("FPGA DOWNLOAD DONE <---\n");
- r = 0;
- return r;
+ return 0;
errout:
finish_driver();
- return r;
+ return err;
}
static void __exit gs_fpgaboot_exit(void)