| Message ID | 20210727122506.6900-1-tangbin@cmss.chinamobile.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | nfc: s3fwrn5: fix undefined parameter values in dev_err() | expand |
| Context | Check | Description |
|---|---|---|
| netdev/cover_letter | success | Link |
| netdev/fixes_present | success | Link |
| netdev/patch_count | success | Link |
| netdev/tree_selection | success | Guessed tree name to be net-next |
| netdev/subject_prefix | warning | Target tree name not specified in the subject |
| netdev/cc_maintainers | fail | 2 blamed authors not CCed: wengjianfeng@yulong.com krzysztof.kozlowski@canonical.com; 2 maintainers not CCed: wengjianfeng@yulong.com krzysztof.kozlowski@canonical.com |
| netdev/source_inline | success | Was 0 now: 0 |
| netdev/verify_signedoff | success | Link |
| netdev/module_param | success | Was 0 now: 0 |
| netdev/build_32bit | fail | Errors and warnings before: 0 this patch: 1 |
| netdev/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| netdev/verify_fixes | success | Link |
| netdev/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 8 lines checked |
| netdev/build_allmodconfig_warn | fail | Errors and warnings before: 0 this patch: 1 |
| netdev/header_inline | success | Link |
On Tue, Jul 27, 2021 at 08:25:06PM +0800, Tang Bin wrote: > In the function s3fwrn5_fw_download(), the 'ret' is not assigned, > so the correct value should be given in dev_err function. > > Fixes: a0302ff5906a ("nfc: s3fwrn5: remove unnecessary label") > Signed-off-by: Zhang Shengju <zhangshengju@cmss.chinamobile.com> > Signed-off-by: Tang Bin <tangbin@cmss.chinamobile.com> This clears up a clang warning that I see: drivers/nfc/s3fwrn5/firmware.c:425:41: error: variable 'ret' is uninitialized when used here [-Werror,-Wuninitialized] "Cannot allocate shash (code=%d)\n", ret); ^~~ ./include/linux/dev_printk.h:144:65: note: expanded from macro 'dev_err' dev_printk_index_wrap(_dev_err, KERN_ERR, dev, dev_fmt(fmt), ##__VA_ARGS__) ^~~~~~~~~~~ ./include/linux/dev_printk.h:110:23: note: expanded from macro 'dev_printk_index_wrap' _p_func(dev, fmt, ##__VA_ARGS__); \ ^~~~~~~~~~~ drivers/nfc/s3fwrn5/firmware.c:416:9: note: initialize the variable 'ret' to silence this warning int ret; ^ = 0 1 error generated. One comment below but regardless: Reviewed-by: Nathan Chancellor <nathan@kernel.org> > --- > drivers/nfc/s3fwrn5/firmware.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/nfc/s3fwrn5/firmware.c b/drivers/nfc/s3fwrn5/firmware.c > index 1421ffd46d9a..52c6f76adfb2 100644 > --- a/drivers/nfc/s3fwrn5/firmware.c > +++ b/drivers/nfc/s3fwrn5/firmware.c > @@ -422,7 +422,7 @@ int s3fwrn5_fw_download(struct s3fwrn5_fw_info *fw_info) > tfm = crypto_alloc_shash("sha1", 0, 0); > if (IS_ERR(tfm)) { > dev_err(&fw_info->ndev->nfc_dev->dev, > - "Cannot allocate shash (code=%d)\n", ret); > + "Cannot allocate shash (code=%d)\n", PTR_ERR(tfm)); We know this is going to be an error pointer so this could be changed to "Cannot allocate shash (code=%pe)\n", tfm); to make it a little cleaner to understand. See commit 57f5677e535b ("printf: add support for printing symbolic error names"). > return PTR_ERR(tfm); > } > > -- > 2.18.2 Cheers, Nathan
Hi Nathan: On 2021/7/28 1:34, Nathan Chancellor wrote: > On Tue, Jul 27, 2021 at 08:25:06PM +0800, Tang Bin wrote: >> In the function s3fwrn5_fw_download(), the 'ret' is not assigned, >> so the correct value should be given in dev_err function. >> >> Fixes: a0302ff5906a ("nfc: s3fwrn5: remove unnecessary label") >> Signed-off-by: Zhang Shengju <zhangshengju@cmss.chinamobile.com> >> Signed-off-by: Tang Bin <tangbin@cmss.chinamobile.com> > This clears up a clang warning that I see: > > drivers/nfc/s3fwrn5/firmware.c:425:41: error: variable 'ret' is uninitialized when used here [-Werror,-Wuninitialized] > "Cannot allocate shash (code=%d)\n", ret); > ^~~ > ./include/linux/dev_printk.h:144:65: note: expanded from macro 'dev_err' > dev_printk_index_wrap(_dev_err, KERN_ERR, dev, dev_fmt(fmt), ##__VA_ARGS__) > ^~~~~~~~~~~ > ./include/linux/dev_printk.h:110:23: note: expanded from macro 'dev_printk_index_wrap' > _p_func(dev, fmt, ##__VA_ARGS__); \ > ^~~~~~~~~~~ > drivers/nfc/s3fwrn5/firmware.c:416:9: note: initialize the variable 'ret' to silence this warning > int ret; > ^ > = 0 > 1 error generated. > > One comment below but regardless: > > Reviewed-by: Nathan Chancellor <nathan@kernel.org> > >> --- >> drivers/nfc/s3fwrn5/firmware.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/drivers/nfc/s3fwrn5/firmware.c b/drivers/nfc/s3fwrn5/firmware.c >> index 1421ffd46d9a..52c6f76adfb2 100644 >> --- a/drivers/nfc/s3fwrn5/firmware.c >> +++ b/drivers/nfc/s3fwrn5/firmware.c >> @@ -422,7 +422,7 @@ int s3fwrn5_fw_download(struct s3fwrn5_fw_info *fw_info) >> tfm = crypto_alloc_shash("sha1", 0, 0); >> if (IS_ERR(tfm)) { >> dev_err(&fw_info->ndev->nfc_dev->dev, >> - "Cannot allocate shash (code=%d)\n", ret); >> + "Cannot allocate shash (code=%d)\n", PTR_ERR(tfm)); > We know this is going to be an error pointer so this could be changed to > > "Cannot allocate shash (code=%pe)\n", tfm); > > to make it a little cleaner to understand. See commit 57f5677e535b > ("printf: add support for printing symbolic error names"). Got it. My patch is looks like a revert, so in the dev_err I used 'PTR_ERR(tfm)'. After your suggestion, I will send V2 for you. Thanks Tang Bin > >> return PTR_ERR(tfm); >> } >> >> -- >> 2.18.2 > Cheers, > Nathan
diff --git a/drivers/nfc/s3fwrn5/firmware.c b/drivers/nfc/s3fwrn5/firmware.c index 1421ffd46d9a..52c6f76adfb2 100644 --- a/drivers/nfc/s3fwrn5/firmware.c +++ b/drivers/nfc/s3fwrn5/firmware.c @@ -422,7 +422,7 @@ int s3fwrn5_fw_download(struct s3fwrn5_fw_info *fw_info) tfm = crypto_alloc_shash("sha1", 0, 0); if (IS_ERR(tfm)) { dev_err(&fw_info->ndev->nfc_dev->dev, - "Cannot allocate shash (code=%d)\n", ret); + "Cannot allocate shash (code=%d)\n", PTR_ERR(tfm)); return PTR_ERR(tfm); }
In the function s3fwrn5_fw_download(), the 'ret' is not assigned, so the correct value should be given in dev_err function. Fixes: a0302ff5906a ("nfc: s3fwrn5: remove unnecessary label") Signed-off-by: Zhang Shengju <zhangshengju@cmss.chinamobile.com> Signed-off-by: Tang Bin <tangbin@cmss.chinamobile.com> --- drivers/nfc/s3fwrn5/firmware.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)