diff options
| author |   Devendra Naga <devendranaga4@gmail.com> | 2014-10-25 02:01:56 +0530 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-10-29 17:39:55 +0800 |
| commit | 84e9cd6b5c42d021cc0a2dac7d6e49e9d9dfa037 (patch) | |
| tree | abbda584186221d5e2d5f75f8eac6e66e5b29d49 /drivers/staging/gs_fpgaboot | |
| parent | staging: gs_fpgpaboot: fix compiler warning with make W=1 (diff) | |
| download | linux-dev-84e9cd6b5c42d021cc0a2dac7d6e49e9d9dfa037.tar.xz linux-dev-84e9cd6b5c42d021cc0a2dac7d6e49e9d9dfa037.zip | |
staging: gs_fpgaboot: fix a compiler warning with make W=2
The below warning is fixed:
drivers/staging/gs_fpgaboot/gs_fpgaboot.c: In function ‘gs_load_image’:
drivers/staging/gs_fpgaboot/gs_fpgaboot.c:196:58: warning: declaration of ‘file’ shadows a global declaration [-Wshadow]
drivers/staging/gs_fpgaboot/gs_fpgaboot.c:45:14: warning: shadowed declaration is here [-Wshadow]
by renaming file function argument of gs_load_image with fw_file.
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.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/gs_fpgaboot/gs_fpgaboot.c b/drivers/staging/gs_fpgaboot/gs_fpgaboot.c index 31caa7464597..6da72858d28c 100644 --- a/drivers/staging/gs_fpgaboot/gs_fpgaboot.c +++ b/drivers/staging/gs_fpgaboot/gs_fpgaboot.c @@ -172,15 +172,15 @@ static int gs_read_image(struct fpgaimage *fimage) return 0; } -static int gs_load_image(struct fpgaimage *fimage, char *file) +static int gs_load_image(struct fpgaimage *fimage, char *fw_file) { int err; - pr_info("load fpgaimage %s\n", file); + pr_info("load fpgaimage %s\n", fw_file); - err = request_firmware(&fimage->fw_entry, file, &firmware_pdev->dev); + err = request_firmware(&fimage->fw_entry, fw_file, &firmware_pdev->dev); if (err != 0) { - pr_err("firmware %s is missing, cannot continue.\n", file); + pr_err("firmware %s is missing, cannot continue.\n", fw_file); return err; } |