| Message ID | 20191023004703.39710-1-natechancellor@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 091c6e9c083f7ebaff00b37ad13562d51464d175 |
| Delegated to: | Kalle Valo |
| Headers | show |
| Series | rtlwifi: Remove unnecessary NULL check in rtl_regd_init | expand |
On Tue, 2019-10-22 at 17:47 -0700, Nathan Chancellor wrote: > When building with Clang + -Wtautological-pointer-compare: > > drivers/net/wireless/realtek/rtlwifi/regd.c:389:33: warning: comparison > of address of 'rtlpriv->regd' equal to a null pointer is always false > [-Wtautological-pointer-compare] > if (wiphy == NULL || &rtlpriv->regd == NULL) > ~~~~~~~~~^~~~ ~~~~ > 1 warning generated. > > The address of an array member is never NULL unless it is the first > struct member so remove the unnecessary check. This was addressed in > the staging version of the driver in commit f986978b32b3 ("Staging: > rtlwifi: remove unnecessary NULL check"). > > While we are here, fix the following checkpatch warning: > > CHECK: Comparison to NULL could be written "!wiphy" > 35: FILE: drivers/net/wireless/realtek/rtlwifi/regd.c:389: > + if (wiphy == NULL) > > Fixes: 0c8173385e54 ("rtl8192ce: Add new driver") > Link:https://github.com/ClangBuiltLinux/linux/issues/750 > Signed-off-by: Nathan Chancellor <natechancellor@gmail.com> Looks good. Thanks for your fix. Acked-by: Ping-Ke Shih <pkshih@realtek.com> > --- > drivers/net/wireless/realtek/rtlwifi/regd.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/net/wireless/realtek/rtlwifi/regd.c > b/drivers/net/wireless/realtek/rtlwifi/regd.c > index c10432cd703e..8be31e0ad878 100644 > --- a/drivers/net/wireless/realtek/rtlwifi/regd.c > +++ b/drivers/net/wireless/realtek/rtlwifi/regd.c > @@ -386,7 +386,7 @@ int rtl_regd_init(struct ieee80211_hw *hw, > struct wiphy *wiphy = hw->wiphy; > struct country_code_to_enum_rd *country = NULL; > > - if (wiphy == NULL || &rtlpriv->regd == NULL) > + if (!wiphy) > return -EINVAL; > > /* init country_code from efuse channel plan */
Nathan Chancellor <natechancellor@gmail.com> wrote: > When building with Clang + -Wtautological-pointer-compare: > > drivers/net/wireless/realtek/rtlwifi/regd.c:389:33: warning: comparison > of address of 'rtlpriv->regd' equal to a null pointer is always false > [-Wtautological-pointer-compare] > if (wiphy == NULL || &rtlpriv->regd == NULL) > ~~~~~~~~~^~~~ ~~~~ > 1 warning generated. > > The address of an array member is never NULL unless it is the first > struct member so remove the unnecessary check. This was addressed in > the staging version of the driver in commit f986978b32b3 ("Staging: > rtlwifi: remove unnecessary NULL check"). > > While we are here, fix the following checkpatch warning: > > CHECK: Comparison to NULL could be written "!wiphy" > 35: FILE: drivers/net/wireless/realtek/rtlwifi/regd.c:389: > + if (wiphy == NULL) > > Fixes: 0c8173385e54 ("rtl8192ce: Add new driver") > Link:https://github.com/ClangBuiltLinux/linux/issues/750 > Signed-off-by: Nathan Chancellor <natechancellor@gmail.com> > Acked-by: Ping-Ke Shih <pkshih@realtek.com> Patch applied to wireless-drivers-next.git, thanks. 091c6e9c083f rtlwifi: Remove unnecessary NULL check in rtl_regd_init
diff --git a/drivers/net/wireless/realtek/rtlwifi/regd.c b/drivers/net/wireless/realtek/rtlwifi/regd.c index c10432cd703e..8be31e0ad878 100644 --- a/drivers/net/wireless/realtek/rtlwifi/regd.c +++ b/drivers/net/wireless/realtek/rtlwifi/regd.c @@ -386,7 +386,7 @@ int rtl_regd_init(struct ieee80211_hw *hw, struct wiphy *wiphy = hw->wiphy; struct country_code_to_enum_rd *country = NULL; - if (wiphy == NULL || &rtlpriv->regd == NULL) + if (!wiphy) return -EINVAL; /* init country_code from efuse channel plan */
When building with Clang + -Wtautological-pointer-compare: drivers/net/wireless/realtek/rtlwifi/regd.c:389:33: warning: comparison of address of 'rtlpriv->regd' equal to a null pointer is always false [-Wtautological-pointer-compare] if (wiphy == NULL || &rtlpriv->regd == NULL) ~~~~~~~~~^~~~ ~~~~ 1 warning generated. The address of an array member is never NULL unless it is the first struct member so remove the unnecessary check. This was addressed in the staging version of the driver in commit f986978b32b3 ("Staging: rtlwifi: remove unnecessary NULL check"). While we are here, fix the following checkpatch warning: CHECK: Comparison to NULL could be written "!wiphy" 35: FILE: drivers/net/wireless/realtek/rtlwifi/regd.c:389: + if (wiphy == NULL) Fixes: 0c8173385e54 ("rtl8192ce: Add new driver") Link:https://github.com/ClangBuiltLinux/linux/issues/750 Signed-off-by: Nathan Chancellor <natechancellor@gmail.com> --- drivers/net/wireless/realtek/rtlwifi/regd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)