Skip to content

Commit af8678e

Browse files
Bitterblue SmithKalle Valo
authored andcommitted
wifi: rtl8xxxu: Don't print the vendor/product/serial
Most devices have a vendor name, product name, and serial number in the efuse, but it's pretty useless. It duplicates the information already printed by the USB subsystem: usb 1-4: New USB device found, idVendor=0bda, idProduct=8178, bcdDevice= 2.00 usb 1-4: New USB device strings: Mfr=1, Product=2, SerialNumber=3 usb 1-4: Product: 802.11n WLAN Adapter usb 1-4: Manufacturer: Realtek usb 1-4: SerialNumber: 00e04c000001 -> usb 1-4: Vendor: Realtek -> usb 1-4: Product: 802.11n WLAN Adapter usb 1-4: New USB device found, idVendor=0bda, idProduct=818b, bcdDevice= 2.00 usb 1-4: New USB device strings: Mfr=1, Product=2, SerialNumber=3 usb 1-4: Product: 802.11n NIC usb 1-4: Manufacturer: Realtek usb 1-4: SerialNumber: 00e04c000001 -> usb 1-4: Vendor: Realtek -> usb 1-4: Product: 802.11n NIC -> usb 1-4: Serial not available. usb 1-4: New USB device found, idVendor=0bda, idProduct=f179, bcdDevice= 0.00 usb 1-4: New USB device strings: Mfr=1, Product=2, SerialNumber=3 usb 1-4: Product: 802.11n usb 1-4: Manufacturer: Realtek usb 1-4: SerialNumber: 002E2DC0041F -> usb 1-4: Vendor: Realtek -> usb 1-4: Product: 802.11n usb 1-4: New USB device found, idVendor=0bda, idProduct=8179, bcdDevice= 0.00 usb 1-4: New USB device strings: Mfr=1, Product=2, SerialNumber=3 usb 1-4: Product: 802.11n NIC usb 1-4: Manufacturer: Realtek usb 1-4: SerialNumber: 00E04C0001 -> usb 1-4: Vendor: Realtek -> usb 1-4: Product: 802.11n NIC -> usb 1-4: Serial: 00E04C0001 Also, that data is not interpreted correctly in all cases: usb 3-1.1.2: New USB device found, idVendor=0bda, idProduct=8179, bcdDevice= 0.00 usb 3-1.1.2: New USB device strings: Mfr=1, Product=2, SerialNumber=3 usb 3-1.1.2: Product: 802.11n NIC usb 3-1.1.2: Manufacturer: Realtek usb 3-1.1.2: Vendor: Realtek usb 3-1.1.2: Product: \x03802.11n NI usb 3-1.1.2: Serial: \xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff Link: https://bugzilla.kernel.org/show_bug.cgi?id=217231 Signed-off-by: Bitterblue Smith <rtl8821cerfe2@gmail.com> Reviewed-by: Ping-Ke Shih <pkshih@realtek.com> Signed-off-by: Kalle Valo <kvalo@kernel.org> Link: https://lore.kernel.org/r/a2a7d9df-0529-7890-3522-48dce613753f@gmail.com
1 parent 59a3a31 commit af8678e

6 files changed

Lines changed: 0 additions & 73 deletions

File tree

drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -568,10 +568,6 @@ static int rtl8188eu_parse_efuse(struct rtl8xxxu_priv *priv)
568568

569569
priv->default_crystal_cap = efuse->xtal_k & 0x3f;
570570

571-
dev_info(&priv->udev->dev, "Vendor: %.7s\n", efuse->vendor_name);
572-
dev_info(&priv->udev->dev, "Product: %.11s\n", efuse->device_name);
573-
dev_info(&priv->udev->dev, "Serial: %.11s\n", efuse->serial);
574-
575571
return 0;
576572
}
577573

drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188f.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -734,9 +734,6 @@ static int rtl8188fu_parse_efuse(struct rtl8xxxu_priv *priv)
734734

735735
priv->default_crystal_cap = efuse->xtal_k & 0x3f;
736736

737-
dev_info(&priv->udev->dev, "Vendor: %.7s\n", efuse->vendor_name);
738-
dev_info(&priv->udev->dev, "Product: %.7s\n", efuse->device_name);
739-
740737
return 0;
741738
}
742739

drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192c.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -441,11 +441,6 @@ static int rtl8192cu_parse_efuse(struct rtl8xxxu_priv *priv)
441441
efuse->ht20_max_power_offset,
442442
sizeof(efuse->ht20_max_power_offset));
443443

444-
dev_info(&priv->udev->dev, "Vendor: %.7s\n",
445-
efuse->vendor_name);
446-
dev_info(&priv->udev->dev, "Product: %.20s\n",
447-
efuse->device_name);
448-
449444
priv->power_base = &rtl8192c_power_base;
450445

451446
if (efuse->rf_regulatory & 0x20) {

drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c

Lines changed: 0 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -601,43 +601,9 @@ rtl8192e_set_tx_power(struct rtl8xxxu_priv *priv, int channel, bool ht40)
601601
}
602602
}
603603

604-
static void rtl8192eu_log_next_device_info(struct rtl8xxxu_priv *priv,
605-
char *record_name,
606-
char *device_info,
607-
unsigned int *record_offset)
608-
{
609-
char *record = device_info + *record_offset;
610-
611-
/* A record is [ total length | 0x03 | value ] */
612-
unsigned char l = record[0];
613-
614-
/*
615-
* The whole device info section seems to be 80 characters, make sure
616-
* we don't read further.
617-
*/
618-
if (*record_offset + l > 80) {
619-
dev_warn(&priv->udev->dev,
620-
"invalid record length %d while parsing \"%s\" at offset %u.\n",
621-
l, record_name, *record_offset);
622-
return;
623-
}
624-
625-
if (l >= 2) {
626-
char value[80];
627-
628-
memcpy(value, &record[2], l - 2);
629-
value[l - 2] = '\0';
630-
dev_info(&priv->udev->dev, "%s: %s\n", record_name, value);
631-
*record_offset = *record_offset + l;
632-
} else {
633-
dev_info(&priv->udev->dev, "%s not available.\n", record_name);
634-
}
635-
}
636-
637604
static int rtl8192eu_parse_efuse(struct rtl8xxxu_priv *priv)
638605
{
639606
struct rtl8192eu_efuse *efuse = &priv->efuse_wifi.efuse8192eu;
640-
unsigned int record_offset;
641607
int i;
642608

643609
if (efuse->rtl_id != cpu_to_le16(0x8129))
@@ -684,26 +650,6 @@ static int rtl8192eu_parse_efuse(struct rtl8xxxu_priv *priv)
684650

685651
priv->default_crystal_cap = priv->efuse_wifi.efuse8192eu.xtal_k & 0x3f;
686652

687-
/*
688-
* device_info section seems to be laid out as records
689-
* [ total length | 0x03 | value ] so:
690-
* - vendor length + 2
691-
* - 0x03
692-
* - vendor string (not null terminated)
693-
* - product length + 2
694-
* - 0x03
695-
* - product string (not null terminated)
696-
* Then there is one or 2 0x00 on all the 4 devices I own or found
697-
* dumped online.
698-
* As previous version of the code handled an optional serial
699-
* string, I now assume there may be a third record if the
700-
* length is not 0.
701-
*/
702-
record_offset = 0;
703-
rtl8192eu_log_next_device_info(priv, "Vendor", efuse->device_info, &record_offset);
704-
rtl8192eu_log_next_device_info(priv, "Product", efuse->device_info, &record_offset);
705-
rtl8192eu_log_next_device_info(priv, "Serial", efuse->device_info, &record_offset);
706-
707653
return 0;
708654
}
709655

drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723a.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -222,10 +222,6 @@ static int rtl8723au_parse_efuse(struct rtl8xxxu_priv *priv)
222222

223223
priv->power_base = &rtl8723a_power_base;
224224

225-
dev_info(&priv->udev->dev, "Vendor: %.7s\n",
226-
efuse->vendor_name);
227-
dev_info(&priv->udev->dev, "Product: %.41s\n",
228-
efuse->device_name);
229225
return 0;
230226
}
231227

drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -494,9 +494,6 @@ static int rtl8723bu_parse_efuse(struct rtl8xxxu_priv *priv)
494494

495495
priv->default_crystal_cap = priv->efuse_wifi.efuse8723bu.xtal_k & 0x3f;
496496

497-
dev_info(&priv->udev->dev, "Vendor: %.7s\n", efuse->vendor_name);
498-
dev_info(&priv->udev->dev, "Product: %.41s\n", efuse->device_name);
499-
500497
return 0;
501498
}
502499

0 commit comments

Comments
 (0)