wifi: rtl8xxxu: Recognise all possible chip cuts
authorBitterblue Smith <rtl8821cerfe2@gmail.com>
Tue, 1 Nov 2022 20:33:49 +0000 (22:33 +0200)
committerKalle Valo <kvalo@kernel.org>
Fri, 4 Nov 2022 11:01:34 +0000 (13:01 +0200)
The chip cut, also known as the chip version, is a letter from A (0)
to P (15). Recognise them all instead of printing "unknown" when it's
greater than E.

Signed-off-by: Bitterblue Smith <rtl8821cerfe2@gmail.com>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/1559c705-0b0b-8dcb-7596-fbb85844d3d9@gmail.com
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c

index 51cb22ee55cd51110c4f1e9bd47ab7e708a8da59..823e50811b0da1c7380193b96355aef5ff0aef13 100644 (file)
@@ -1574,30 +1574,14 @@ rtl8xxxu_set_spec_sifs(struct rtl8xxxu_priv *priv, u16 cck, u16 ofdm)
 static void rtl8xxxu_print_chipinfo(struct rtl8xxxu_priv *priv)
 {
        struct device *dev = &priv->udev->dev;
-       char *cut;
+       char cut = '?';
 
-       switch (priv->chip_cut) {
-       case 0:
-               cut = "A";
-               break;
-       case 1:
-               cut = "B";
-               break;
-       case 2:
-               cut = "C";
-               break;
-       case 3:
-               cut = "D";
-               break;
-       case 4:
-               cut = "E";
-               break;
-       default:
-               cut = "unknown";
-       }
+       /* Currently always true: chip_cut is 4 bits. */
+       if (priv->chip_cut <= 15)
+               cut = 'A' + priv->chip_cut;
 
        dev_info(dev,
-                "RTL%s rev %s (%s) %iT%iR, TX queues %i, WiFi=%i, BT=%i, GPS=%i, HI PA=%i\n",
+                "RTL%s rev %c (%s) %iT%iR, TX queues %i, WiFi=%i, BT=%i, GPS=%i, HI PA=%i\n",
                 priv->chip_name, cut, priv->chip_vendor, priv->tx_paths,
                 priv->rx_paths, priv->ep_tx_count, priv->has_wifi,
                 priv->has_bluetooth, priv->has_gps, priv->hi_pa);