nxpwifi updates for Linux v7.4 (PR #2)

- Fix timeout handling in nxpwifi_sdio_poll_card_status()
 - Use str_on_off() helper for carrier state reporting
 -----BEGIN PGP SIGNATURE-----
 
 iQGzBAABCgAdFiEEjaYdK5ZhVMlA99Z28Jbi9L0AIAYFAmrPJqQACgkQ8Jbi9L0A
 IAZBdAwApxJdCQSemf2R5lWYs3WWqMaSOQuq6XMVqQt6Ljx3Dq9V4je9H3PCb7oR
 Jx2k7FohJz6MatdhSC7BLEbkexxyLaPz3d+nW1xtJxW6OCWSsrft4rDa/DPvl/C0
 4cR9pGJeusZGQ6Y/Z9puZJD+www8IJlYnUqtc754zhNQ7LYMyxVf0//TGn1/rNLP
 gzCrVUhlGtGGz7fVrMBSTvx8ssdbD8DWYDlm7UodhApssfwEAh+eSgvuY8fElfOo
 Mm+kObHkBr/N7XoGxkuHct6Qkemm+IpvrWhGuMijMJ98Oqr5nEb++ORSx4lcIh7C
 cAG5gkMDQpjXv06ben9+EXfkC7TzzZXCSysU5vPe9K9gujB6yuJpWgeCb/Udg93G
 w2Abhv3PeXUg3WeEaGHn4qeRVJxulOdNTrdBk5W3kgsd090kJaLUjvh1YBfP2fGc
 e1C+/yerHzhpcg73vtkMCi4MjEvKnUWXi7bc7+3WQKIACRhxmqI6g+GE6M59V7AJ
 sR0AZVQT
 =lOw7
 -----END PGP SIGNATURE-----

Merge tag 'nxpwifi-next-20261014' of https://github.com/nxp-upstream/nxpwifi-next

Jeff Chen writes:
=================
nxpwifi updates for Linux v7.4 (PR #2)

- Fix timeout handling in nxpwifi_sdio_poll_card_status()
- Use str_on_off() helper for carrier state reporting
=================

Signed-off-by: Johannes Berg <johannes.berg@intel.com>

drivers/net/wireless/nxp/nxpwifi/debugfs.c

@@ -6,6 +6,7 @@
  */
 
 #include <linux/debugfs.h>
+#include <linux/string_choices.h>
 
 #include "main.h"
 #include "cmdevt.h"
@@ -98,8 +99,8 @@ nxpwifi_info_read(struct file *file, char __user *ubuf,
 	p += sprintf(p, "num_rx_pkts_dropped = %lu\n", priv->stats.rx_dropped);
 	p += sprintf(p, "num_tx_pkts_err = %lu\n", priv->stats.tx_errors);
 	p += sprintf(p, "num_rx_pkts_err = %lu\n", priv->stats.rx_errors);
-	p += sprintf(p, "carrier %s\n", ((netif_carrier_ok(priv->netdev))
-					 ? "on" : "off"));
+	p += sprintf(p, "carrier %s\n",
+		     str_on_off(netif_carrier_ok(priv->netdev)));
 	p += sprintf(p, "tx queue");
 	for (i = 0; i < netdev->num_tx_queues; i++) {
 		txq = netdev_get_tx_queue(netdev, i);

drivers/net/wireless/nxp/nxpwifi/main.c

@@ -5,6 +5,7 @@
  * Copyright 2011-2024 NXP
  */
 
+#include <linux/string_choices.h>
 #include <linux/suspend.h>
 
 #include "main.h"
@@ -1094,8 +1095,8 @@ void nxpwifi_drv_info_dump(struct nxpwifi_adapter *adapter)
 			     atomic_read(&priv->wmm_tx_pending[3]));
 		p += sprintf(p, "media_state=\"%s\"\n", !priv->media_connected ?
 			     "Disconnected" : "Connected");
-		p += sprintf(p, "carrier %s\n", (netif_carrier_ok(priv->netdev)
-			     ? "on" : "off"));
+		p += sprintf(p, "carrier %s\n",
+			     str_on_off(netif_carrier_ok(priv->netdev)));
 		for (idx = 0; idx < priv->netdev->num_tx_queues; idx++) {
 			txq = netdev_get_tx_queue(priv->netdev, idx);
 			p += sprintf(p, "tx queue %d:%s  ", idx,

drivers/net/wireless/nxp/nxpwifi/sdio.c

@@ -680,7 +680,7 @@ nxpwifi_sdio_poll_card_status(struct nxpwifi_adapter *adapter, u8 bits)
 
 	nxpwifi_dbg(adapter, ERROR, "poll card status failed, tries = %d\n", tries);
 
-	return ret;
+	return ret ?: -ETIMEDOUT;
 }
 
 /* Disable SDIO host interrupt and release IRQ. */