diff mbox series

[3/3] Undoing Macros with flow control statements.

Message ID 20250205205452.384911-1-jacklivingood@comcast.net (mailing list archive)
State New
Delegated to: Johannes Berg
Headers show
Series None | expand

Commit Message

jack Livingood Feb. 5, 2025, 8:54 p.m. UTC 
Signed off by Jack Livingood <jacklivingood@comcast.net>
---
 drivers/net/wireless/intel/iwlwifi/iwl-io.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

Comments

Julian Calaby Feb. 5, 2025, 9:17 p.m. UTC | #1 
Hi Jack,

On Thu, Feb 6, 2025 at 7:58 AM jack Livingood <jacklivingood@comcast.net> wrote:
>
> Signed off by Jack Livingood <jacklivingood@comcast.net>

Why?

> ---
>  drivers/net/wireless/intel/iwlwifi/iwl-io.c | 14 +++++++++-----
>  1 file changed, 9 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-io.c b/drivers/net/wireless/intel/iwlwifi/iwl-io.c
> index cd7eebe6a7b1..957000d5df68 100644
> --- a/drivers/net/wireless/intel/iwlwifi/iwl-io.c
> +++ b/drivers/net/wireless/intel/iwlwifi/iwl-io.c
> @@ -230,15 +230,19 @@ IWL_EXPORT_SYMBOL(iwl_force_nmi);
>  static const char *get_rfh_string(int cmd)
>  {
>  #define IWL_CMD(x) case x: return #x
> -#define IWL_CMD_MQ(arg, reg, q) { if (arg == reg(q)) return #reg; }
> +

This doesn't pass checkpatch.

>
>         int i;
>
>         for (i = 0; i < IWL_MAX_RX_HW_QUEUES; i++) {
> -               IWL_CMD_MQ(cmd, RFH_Q_FRBDCB_BA_LSB, i);
> -               IWL_CMD_MQ(cmd, RFH_Q_FRBDCB_WIDX, i);
> -               IWL_CMD_MQ(cmd, RFH_Q_FRBDCB_RIDX, i);
> -               IWL_CMD_MQ(cmd, RFH_Q_URBD_STTS_WPTR_LSB, i);
> +               if (cmd == RFH_Q_FRBDCB_BA_LSB(i))
> +                       return #cmd;

And this is not the correct expansion of this macro and won't compile.

Please read the documentation on submitting patches:
https://wireless.docs.kernel.org/en/latest/en/developers/documentation/submittingpatches.html

And please explain what you're trying to achieve here.

Thanks,
diff mbox series

Patch

diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-io.c b/drivers/net/wireless/intel/iwlwifi/iwl-io.c
index cd7eebe6a7b1..957000d5df68 100644
--- a/drivers/net/wireless/intel/iwlwifi/iwl-io.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-io.c
@@ -230,15 +230,19 @@  IWL_EXPORT_SYMBOL(iwl_force_nmi);
 static const char *get_rfh_string(int cmd)
 {
 #define IWL_CMD(x) case x: return #x
-#define IWL_CMD_MQ(arg, reg, q) { if (arg == reg(q)) return #reg; }
+
 
 	int i;
 
 	for (i = 0; i < IWL_MAX_RX_HW_QUEUES; i++) {
-		IWL_CMD_MQ(cmd, RFH_Q_FRBDCB_BA_LSB, i);
-		IWL_CMD_MQ(cmd, RFH_Q_FRBDCB_WIDX, i);
-		IWL_CMD_MQ(cmd, RFH_Q_FRBDCB_RIDX, i);
-		IWL_CMD_MQ(cmd, RFH_Q_URBD_STTS_WPTR_LSB, i);
+		if (cmd == RFH_Q_FRBDCB_BA_LSB(i))
+			return #cmd;
+		if (cmd == RFH_Q_FRBDCB_WIDX(i))
+			return #cmd;
+		if (cmd == RFH_Q_FRBDCB_RIDX(i))
+			return #cmd;
+		if (cmd == RFH_Q_URBD_STTS_WPTR_LSB(i))
+			return #cmd;
 	}
 
 	switch (cmd) {