| From 28c9d94b6473f64f8fa0a762799420b9df7ba327 Mon Sep 17 00:00:00 2001 |
| From: Arnd Bergmann <arnd@arndb.de> |
| Date: Thu, 25 Apr 2019 18:25:54 +0200 |
| Subject: s390: qeth: address type mismatch warning |
| |
| [ Upstream commit 46b83629dede262315aa82179d105581f11763b6 ] |
| |
| clang produces a harmless warning for each use for the qeth_adp_supported |
| macro: |
| |
| drivers/s390/net/qeth_l2_main.c:559:31: warning: implicit conversion from enumeration type 'enum qeth_ipa_setadp_cmd' to |
| different enumeration type 'enum qeth_ipa_funcs' [-Wenum-conversion] |
| if (qeth_adp_supported(card, IPA_SETADP_SET_PROMISC_MODE)) |
| ~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
| drivers/s390/net/qeth_core.h:179:41: note: expanded from macro 'qeth_adp_supported' |
| qeth_is_ipa_supported(&c->options.adp, f) |
| ~~~~~~~~~~~~~~~~~~~~~ ^ |
| |
| Add a version of this macro that uses the correct types, and |
| remove the unused qeth_adp_enabled() macro that has the same |
| problem. |
| |
| Reviewed-by: Nathan Chancellor <natechancellor@gmail.com> |
| Signed-off-by: Arnd Bergmann <arnd@arndb.de> |
| Signed-off-by: Julian Wiedmann <jwi@linux.ibm.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/s390/net/qeth_core.h | 10 +++++++--- |
| 1 file changed, 7 insertions(+), 3 deletions(-) |
| |
| diff --git a/drivers/s390/net/qeth_core.h b/drivers/s390/net/qeth_core.h |
| index c851cf6e01c43..d603dfea97ab2 100644 |
| --- a/drivers/s390/net/qeth_core.h |
| +++ b/drivers/s390/net/qeth_core.h |
| @@ -163,6 +163,12 @@ struct qeth_vnicc_info { |
| bool rx_bcast_enabled; |
| }; |
| |
| +static inline int qeth_is_adp_supported(struct qeth_ipa_info *ipa, |
| + enum qeth_ipa_setadp_cmd func) |
| +{ |
| + return (ipa->supported_funcs & func); |
| +} |
| + |
| static inline int qeth_is_ipa_supported(struct qeth_ipa_info *ipa, |
| enum qeth_ipa_funcs func) |
| { |
| @@ -176,9 +182,7 @@ static inline int qeth_is_ipa_enabled(struct qeth_ipa_info *ipa, |
| } |
| |
| #define qeth_adp_supported(c, f) \ |
| - qeth_is_ipa_supported(&c->options.adp, f) |
| -#define qeth_adp_enabled(c, f) \ |
| - qeth_is_ipa_enabled(&c->options.adp, f) |
| + qeth_is_adp_supported(&c->options.adp, f) |
| #define qeth_is_supported(c, f) \ |
| qeth_is_ipa_supported(&c->options.ipa4, f) |
| #define qeth_is_enabled(c, f) \ |
| -- |
| 2.20.1 |
| |