Bluetooth: trivial: tidy up printk message output from btrtl.
PATCH v2 1/1 Bluetooth: trivial: tidy up printk message output from btrtl.
From: Rui <[email protected]>
v2: also remove new line from hci_h5.c
The rtl_dev_* calls in the Realtek USB Bluetooth driver add unnecessary device prefixes and new lines at the end of most messages, which make the dmesg output look like this:
[ 5.667121] sd 0:0:0:0: [sda] Attached SCSI disk [ 5.736869] Bluetooth: hci0: RTL: rtl: examining hci_ver=06 hci_rev=000a lmp_ver=06 lmp_subver=8821
[ 5.737853] Bluetooth: hci0: RTL: rom_version status=0 version=1
[ 5.737857] Bluetooth: hci0: RTL: rtl: loading rtl_bt/rtl8821a_fw.bin
[ 5.737946] Bluetooth: hci0: RTL: rtl: loading rtl_bt/rtl8821a_config.bin
[ 5.737965] bluetooth hci0: Direct firmware load for rtl_bt/rtl8821a_config.bin failed with error -2 [ 5.737972] Bluetooth: hci0: RTL: cfg_sz -2, total sz 17428
[ 5.997375] ata2: SATA link up 1.5 Gbps (SStatus 113 SControl 300)
Clean this up by removing extraneous new lines and redundant device prefixes, with the following result:
[ 5.667008] sd 0:0:0:0: [sda] Attached SCSI disk [ 5.716945] Bluetooth: hci0: rtl: examining hci_ver=06 hci_rev=000a lmp_ver=06 lmp_subver=8821 [ 5.718745] Bluetooth: hci0: rtl: rom_version status=0 version=1 [ 5.718749] Bluetooth: hci0: rtl: loading rtl_bt/rtl8821a_fw.bin [ 5.718830] Bluetooth: hci0: rtl: loading rtl_bt/rtl8821a_config.bin [ 5.718849] bluetooth hci0: Direct firmware load for rtl_bt/rtl8821a_config.bin failed with error -2 [ 5.718858] Bluetooth: hci0: rtl: cfg_sz -2, total sz 17428 [ 5.997400] ata2: SATA link up 1.5 Gbps (SStatus 113 SControl 300)
--- drivers/bluetooth/btrtl.c | 62 +++++++++++++++++++------------------- drivers/bluetooth/btrtl.h | 8 ++--- drivers/bluetooth/hci_h5.c | 2 +- 3 files changed, 36 insertions(+), 36 deletions(-)
drivers/bluetooth/btrtl.c +31 -31
@@ -186,19 +186,19 @@ static int rtl_read_rom_version(struct hci_dev *hdev, u8 *version)/* Read RTL ROM version command */ skb =__hci_cmd_sync (hdev,0xfc6d ,0 ,NULL ,HCI_INIT_TIMEOUT );if (IS_ERR (skb)) { -rtl_dev_err (hdev,"Read ROM version failed (%ld)\n" , +rtl_dev_err (hdev,"Read ROM version failed (%ld)" ,PTR_ERR (skb));return PTR_ERR (skb); }if (skb->len !=sizeof (*rom_version)) { -rtl_dev_err (hdev,"RTL version event length mismatch\n" ); +rtl_dev_err (hdev,"RTL version event length mismatch" );kfree_skb (skb);return -EIO ; } rom_version = (struct rtl_rom_version_evt *)skb->data; -rtl_dev_info (hdev,"rom_version status=%x version=%x\n" , +rtl_dev_info (hdev,"rom_version status=%x version=%x" , rom_version->status, rom_version->version); *version = rom_version->version;
@@ -242,7 +242,7 @@ static int rtlbt_parse_firmware(struct hci_dev *hdev, fwptr = btrtl_dev->fw_data + btrtl_dev->fw_len -sizeof (extension_sig);if (memcmp (fwptr, extension_sig,sizeof (extension_sig)) !=0 ) { -rtl_dev_err (hdev,"extension section signature mismatch\n" ); +rtl_dev_err (hdev,"extension section signature mismatch" );return -EINVAL ; }
@@ -263,7 +263,7 @@ static int rtlbt_parse_firmware(struct hci_dev *hdev,break ;if (length ==0 ) { -rtl_dev_err (hdev,"found instruction with length 0\n" ); +rtl_dev_err (hdev,"found instruction with length 0" );return -EINVAL ; }
@@ -276,7 +276,7 @@ static int rtlbt_parse_firmware(struct hci_dev *hdev, }if (project_id <0 ) { -rtl_dev_err (hdev,"failed to find version instruction\n" ); +rtl_dev_err (hdev,"failed to find version instruction" );return -EINVAL ; }
@@ -287,13 +287,13 @@ static int rtlbt_parse_firmware(struct hci_dev *hdev, }if (i >=ARRAY_SIZE (project_id_to_lmp_subver)) { -rtl_dev_err (hdev,"unknown project id %d\n" , project_id); +rtl_dev_err (hdev,"unknown project id %d" , project_id);return -EINVAL ; }if (btrtl_dev->ic_info->lmp_subver != project_id_to_lmp_subver[i].lmp_subver) { -rtl_dev_err (hdev,"firmware is for %x but this is a %x\n" , +rtl_dev_err (hdev,"firmware is for %x but this is a %x" , project_id_to_lmp_subver[i].lmp_subver, btrtl_dev->ic_info->lmp_subver);return -EINVAL ;
@@ -301,7 +301,7 @@ static int rtlbt_parse_firmware(struct hci_dev *hdev, epatch_info = (struct rtl_epatch_header *)btrtl_dev->fw_data;if (memcmp (epatch_info->signature,RTL_EPATCH_SIGNATURE ,8 ) !=0 ) { -rtl_dev_err (hdev,"bad EPATCH signature\n" ); +rtl_dev_err (hdev,"bad EPATCH signature" );return -EINVAL ; }
@@ -389,14 +389,14 @@ static int rtl_download_firmware(struct hci_dev *hdev, skb =__hci_cmd_sync (hdev,0xfc20 , frag_len +1 , dl_cmd,HCI_INIT_TIMEOUT );if (IS_ERR (skb)) { -rtl_dev_err (hdev,"download fw command failed (%ld)\n" , +rtl_dev_err (hdev,"download fw command failed (%ld)" ,PTR_ERR (skb)); ret = -PTR_ERR (skb); goto out; }if (skb->len !=sizeof (struct rtl_download_response )) { -rtl_dev_err (hdev,"download fw event length mismatch\n" ); +rtl_dev_err (hdev,"download fw event length mismatch" );kfree_skb (skb); ret = -EIO ; goto out;
@@ -416,7 +416,7 @@ static int rtl_load_file(struct hci_dev *hdev, const char *name, u8 **buff)const struct firmware *fw;int ret; -rtl_dev_info (hdev,"rtl: loading %s\n" , name); +rtl_dev_info (hdev,"loading %s" , name); ret =request_firmware (&fw, name, &hdev->dev);if (ret <0 )return ret;
@@ -440,7 +440,7 @@ static int btrtl_setup_rtl8723a(struct hci_dev *hdev,* (which is only for RTL8723B and newer). */ if (!memcmp (btrtl_dev->fw_data,RTL_EPATCH_SIGNATURE ,8 )) { -rtl_dev_err (hdev,"unexpected EPATCH signature!\n" ); +rtl_dev_err (hdev,"unexpected EPATCH signature!" );return -EINVAL ; }
@@ -475,7 +475,7 @@ static int btrtl_setup_rtl8723b(struct hci_dev *hdev, fw_data = tbuff; } -rtl_dev_info (hdev,"cfg_sz %d, total sz %d\n" , btrtl_dev->cfg_len, ret); +rtl_dev_info (hdev,"cfg_sz %d, total sz %d" , btrtl_dev->cfg_len, ret); ret =rtl_download_firmware (hdev, fw_data, ret);
@@ -491,13 +491,13 @@ static struct sk_buff *btrtl_read_local_version(struct hci_dev *hdev) skb =__hci_cmd_sync (hdev,HCI_OP_READ_LOCAL_VERSION ,0 ,NULL ,HCI_INIT_TIMEOUT );if (IS_ERR (skb)) { -rtl_dev_err (hdev,"HCI_OP_READ_LOCAL_VERSION failed (%ld)\n" , +rtl_dev_err (hdev,"HCI_OP_READ_LOCAL_VERSION failed (%ld)" ,PTR_ERR (skb));return skb; }if (skb->len !=sizeof (struct hci_rp_read_local_version )) { -rtl_dev_err (hdev,"HCI_OP_READ_LOCAL_VERSION event length mismatch\n" ); +rtl_dev_err (hdev,"HCI_OP_READ_LOCAL_VERSION event length mismatch" );kfree_skb (skb);return ERR_PTR (-EIO ); }
@@ -537,7 +537,7 @@ struct btrtl_device_info *btrtl_initialize(struct hci_dev *hdev, } resp = (struct hci_rp_read_local_version *)skb->data; -rtl_dev_info (hdev,"rtl: examining hci_ver=%02x hci_rev=%04x lmp_ver=%02x lmp_subver=%04x\n" , +rtl_dev_info (hdev,"examining hci_ver=%02x hci_rev=%04x lmp_ver=%02x lmp_subver=%04x" , resp->hci_ver, resp->hci_rev, resp->lmp_ver, resp->lmp_subver);
@@ -550,7 +550,7 @@ struct btrtl_device_info *btrtl_initialize(struct hci_dev *hdev, hdev->bus);if (!btrtl_dev->ic_info) { -rtl_dev_info (hdev,"rtl: unknown IC info, lmp subver %04x, hci rev %04x, hci ver %04x" , +rtl_dev_info (hdev,"unknown IC info, lmp subver %04x, hci rev %04x, hci ver %04x" , lmp_subver, hci_rev, hci_ver);return btrtl_dev; }
@@ -564,7 +564,7 @@ struct btrtl_device_info *btrtl_initialize(struct hci_dev *hdev, btrtl_dev->fw_len =rtl_load_file (hdev, btrtl_dev->ic_info->fw_name, &btrtl_dev->fw_data);if (btrtl_dev->fw_len <0 ) { -rtl_dev_err (hdev,"firmware file %s not found\n" , +rtl_dev_err (hdev,"firmware file %s not found" , btrtl_dev->ic_info->fw_name); ret = btrtl_dev->fw_len; goto err_free;
@@ -582,7 +582,7 @@ struct btrtl_device_info *btrtl_initialize(struct hci_dev *hdev, &btrtl_dev->cfg_data);if (btrtl_dev->ic_info->config_needed && btrtl_dev->cfg_len <=0 ) { -rtl_dev_err (hdev,"mandatory config file %s not found\n" , +rtl_dev_err (hdev,"mandatory config file %s not found" , btrtl_dev->ic_info->cfg_name); ret = btrtl_dev->cfg_len; goto err_free;
@@ -608,7 +608,7 @@ int btrtl_download_firmware(struct hci_dev *hdev,* to a different value. */ if (!btrtl_dev->ic_info) { -rtl_dev_info (hdev,"rtl: assuming no firmware upload needed\n" ); +rtl_dev_info (hdev,"assuming no firmware upload needed" );return 0 ; }
@@ -622,7 +622,7 @@ int btrtl_download_firmware(struct hci_dev *hdev,case RTL_ROM_LMP_8822B :return btrtl_setup_rtl8723b (hdev, btrtl_dev);default : -rtl_dev_info (hdev,"rtl: assuming no firmware upload needed\n" ); +rtl_dev_info (hdev,"assuming no firmware upload needed" );return 0 ; } }
@@ -714,18 +714,18 @@ int btrtl_get_uart_settings(struct hci_dev *hdev, total_data_len = btrtl_dev->cfg_len -sizeof (*config);if (total_data_len <=0 ) { -rtl_dev_warn (hdev,"no config loaded\n" ); +rtl_dev_warn (hdev,"no config loaded" );return -EINVAL ; } config = (struct rtl_vendor_config *)btrtl_dev->cfg_data;if (le32_to_cpu (config->signature) !=RTL_CONFIG_MAGIC ) { -rtl_dev_err (hdev,"invalid config magic\n" ); +rtl_dev_err (hdev,"invalid config magic" );return -EINVAL ; }if (total_data_len <le16_to_cpu (config->total_len)) { -rtl_dev_err (hdev,"config is too short\n" ); +rtl_dev_err (hdev,"config is too short" );return -EINVAL ; }
@@ -735,7 +735,7 @@ int btrtl_get_uart_settings(struct hci_dev *hdev,switch (le16_to_cpu (entry->offset)) {case 0xc :if (entry->len <sizeof (*device_baudrate)) { -rtl_dev_err (hdev,"invalid UART config entry\n" ); +rtl_dev_err (hdev,"invalid UART config entry" );return -EINVAL ; }
@@ -752,7 +752,7 @@ int btrtl_get_uart_settings(struct hci_dev *hdev,break ;default : -rtl_dev_dbg (hdev,"skipping config entry 0x%x (len %u)\n" , +rtl_dev_dbg (hdev,"skipping config entry 0x%x (len %u)" ,le16_to_cpu (entry->offset), entry->len);break ; };
@@ -761,13 +761,13 @@ int btrtl_get_uart_settings(struct hci_dev *hdev, }if (!found) { -rtl_dev_err (hdev,"no UART config entry found\n" ); +rtl_dev_err (hdev,"no UART config entry found" );return -ENOENT ; } -rtl_dev_dbg (hdev,"device baudrate = 0x%08x\n" , *device_baudrate); -rtl_dev_dbg (hdev,"controller baudrate = %u\n" , *controller_baudrate); -rtl_dev_dbg (hdev,"flow control %d\n" , *flow_control); +rtl_dev_dbg (hdev,"device baudrate = 0x%08x" , *device_baudrate); +rtl_dev_dbg (hdev,"controller baudrate = %u" , *controller_baudrate); +rtl_dev_dbg (hdev,"flow control %d" , *flow_control);return 0 ; }
drivers/bluetooth/btrtl.h +4 -4
@@ -7,10 +7,10 @@#define RTL_FRAG_LEN 252 -#define rtl_dev_err (dev, fmt, ...) bt_dev_err(dev, "RTL: " fmt, ##__VA_ARGS__) -#define rtl_dev_warn (dev, fmt, ...) bt_dev_warn(dev, "RTL: " fmt, ##__VA_ARGS__) -#define rtl_dev_info (dev, fmt, ...) bt_dev_info(dev, "RTL: " fmt, ##__VA_ARGS__) -#define rtl_dev_dbg (dev, fmt, ...) bt_dev_dbg(dev, "RTL: " fmt, ##__VA_ARGS__) +#define rtl_dev_err (dev, fmt, ...) bt_dev_err(dev, "rtl: " fmt, ##__VA_ARGS__) +#define rtl_dev_warn (dev, fmt, ...) bt_dev_warn(dev, "rtl: " fmt, ##__VA_ARGS__) +#define rtl_dev_info (dev, fmt, ...) bt_dev_info(dev, "rtl: " fmt, ##__VA_ARGS__) +#define rtl_dev_dbg (dev, fmt, ...) bt_dev_dbg(dev, "rtl: " fmt, ##__VA_ARGS__)struct btrtl_device_info ;
drivers/bluetooth/hci_h5.c +1 -1
@@ -875,7 +875,7 @@ static int h5_btrtl_setup(struct h5 *h5) skb =__hci_cmd_sync (h5->hu->hdev,0xfc17 ,sizeof (baudrate_data), &baudrate_data,HCI_INIT_TIMEOUT );if (IS_ERR (skb)) { -rtl_dev_err (h5->hu->hdev,"set baud rate command failed\n" ); +rtl_dev_err (h5->hu->hdev,"set baud rate command failed" ); err =PTR_ERR (skb); goto out_free; }else {
Signature · 1 line
2.23.0
Marcel Holtmann
maintainerHi Rui,
Quoted 32 lines
v2: also remove new line from
hci_h5.cThe rtl_dev_* calls in the Realtek USB Bluetooth driver add unnecessary device prefixes and new lines at the end of most messages, which make the dmesg output look like this:
[ 5.667121] sd 0:0:0:0: [sda] Attached SCSI disk [ 5.736869] Bluetooth: hci0: RTL: rtl: examining hci_ver=06 hci_rev=000a lmp_ver=06 lmp_subver=8821[ 5.737853] Bluetooth: hci0: RTL: rom_version status=0 version=1[ 5.737857] Bluetooth: hci0: RTL: rtl: loading rtl_bt/rtl8821a_fw.bin[ 5.737946] Bluetooth: hci0: RTL: rtl: loading rtl_bt/rtl8821a_config.bin[ 5.737965] bluetooth hci0: Direct firmware load for rtl_bt/rtl8821a_config.bin failed with error -2 [ 5.737972] Bluetooth: hci0: RTL: cfg_sz -2, total sz 17428[ 5.997375] ata2: SATA link up 1.5 Gbps (SStatus 113 SControl 300)Clean this up by removing extraneous new lines and redundant device prefixes, with the following result:
[ 5.667008] sd 0:0:0:0: [sda] Attached SCSI disk [ 5.716945] Bluetooth: hci0: rtl: examining hci_ver=06 hci_rev=000a lmp_ver=06 lmp_subver=8821 [ 5.718745] Bluetooth: hci0: rtl: rom_version status=0 version=1 [ 5.718749] Bluetooth: hci0: rtl: loading rtl_bt/rtl8821a_fw.bin [ 5.718830] Bluetooth: hci0: rtl: loading rtl_bt/rtl8821a_config.bin [ 5.718849] bluetooth hci0: Direct firmware load for rtl_bt/rtl8821a_config.bin failed with error -2 [ 5.718858] Bluetooth: hci0: rtl: cfg_sz -2, total sz 17428 [ 5.997400] ata2: SATA link up 1.5 Gbps (SStatus 113 SControl 300)
Quoted 6 lines
Signed-off-by Rui Salvaterra <[email protected]>---
drivers/bluetooth/btrtl.c | 62 +++++++++++++++++++------------------- drivers/bluetooth/btrtl.h | 8 ++--- drivers/bluetooth/hci_h5.c | 2 +- 3 files changed, 36 insertions(+), 36 deletions(-)
I have some similar patch in my tree. Can you check what is still missing and send a new version. Thanks.
Regards
Marcel
Hi, Marcel,
Quoted 2 lines · Marcel Holtmann
Hi Rui,
[patch snipped]
Quoted 1 line
I have some similar patch in my tree. Can you check what is still missing and send a new version. Thanks.
Yeah, from a cursory look at your tree, it seems about the same as mine. I'll take a deeper look later on (can't access the laptops to test, ATM) and send a patch with any missing stuff, if needed.
Thanks,
Rui