drivers: bluetooth: ath3k: replace hardcode numbers with define
PATCH v2 1/5 drivers: bluetooth: ath3k: replace hardcode numbers with define
Replaced the numbers with a readable define.
--- drivers/bluetooth/ath3k.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/bluetooth/ath3k.c +5 -4
@@ -227,15 +227,16 @@ static int ath3k_load_firmware(struct usb_device *udev,return -ENOMEM ; } -memcpy (send_buf, firmware->data,20 ); +memcpy (send_buf, firmware->data,FW_HDR_SIZE ); err =usb_control_msg (udev, pipe,USB_REQ_DFU_DNLOAD ,USB_TYPE_VENDOR , -0 ,0 , send_buf,20 ,USB_CTRL_SET_TIMEOUT ); +0 ,0 , send_buf,FW_HDR_SIZE , +USB_CTRL_SET_TIMEOUT );if (err <0 ) {BT_ERR ("Can't change to loading configuration err" ); goto error; } - sent +=20 ; - count -=20 ; + sent +=FW_HDR_SIZE ; + count -=FW_HDR_SIZE ; pipe =usb_sndbulkpipe (udev,0x02 );
Signature · 1 line
2.16.1
PATCH v2 2/5 drivers: bluetooth: ath3k: do not init variables
Do not need to initialize variables, because further on the code they fall into the snprintf.
--- drivers/bluetooth/ath3k.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/bluetooth/ath3k.c +2 -2
@@ -399,7 +399,7 @@ static int ath3k_set_normal_mode(struct usb_device *udev)static int ath3k_load_patch (struct usb_device *udev) {unsigned char fw_state; -char filename[ATH3K_NAME_LEN ] = {0 }; +char filename[ATH3K_NAME_LEN ];const struct firmware *firmware;struct ath3k_version fw_version;__u32 pt_rom_version, pt_build_version;
@@ -452,7 +452,7 @@ static int ath3k_load_patch(struct usb_device *udev)static int ath3k_load_syscfg (struct usb_device *udev) {unsigned char fw_state; -char filename[ATH3K_NAME_LEN ] = {0 }; +char filename[ATH3K_NAME_LEN ];const struct firmware *firmware;struct ath3k_version fw_version;int clk_value, ret;
Signature · 1 line
2.16.1
PATCH v2 3/5 drivers: bluetooth: ath3k: remove blank line after if
In reply to Maxim ZhukovRemoved blank line after if.
--- drivers/bluetooth/ath3k.c | 1 - 1 file changed, 1 deletion(-)
drivers/bluetooth/ath3k.c +0 -1
@@ -523,7 +523,6 @@ static int ath3k_probe(struct usb_interface *intf,/* load patch and sysconfig files for AR3012 */ if (id->driver_info &BTUSB_ATH3012 ) { -/* New firmware with patch and sysconfig files already loaded */ if (le16_to_cpu (udev->descriptor.bcdDevice) >0x0001 )return -ENODEV ;
Signature · 1 line
2.16.1
PATCH v2 4/5 drivers: bluetooth: ath3k: Fix warning: quoted string split across lines
In reply to Maxim ZhukovThis patch avoided the warning:
WARNING: quoted string split across lines
#355: FILE: drivers/bluetooth/ath3k.c:355:
+ BT_ERR("Error in firmware loading err = %d,"
+ "len = %d, size = %d", err, len, size);
This patch fix this issue.
--- drivers/bluetooth/ath3k.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
drivers/bluetooth/ath3k.c +8 -4
@@ -203,6 +203,12 @@ static const struct usb_device_id ath3k_blist_tbl[] = { { }/* Terminating entry */ }; +static inline void ath3k_log_failed_loading (int err,int len,int size) +{ +BT_ERR ("Error in firmware loading err = %d, len = %d, size = %d" , + err, len, size); +} +#define USB_REQ_DFU_DNLOAD 1#define BULK_SIZE 4096#define FW_HDR_SIZE 20
@@ -251,8 +257,7 @@ static int ath3k_load_firmware(struct usb_device *udev, &len, 3000);if (err || (len != size)) { -BT_ERR ("Error in firmware loading err = %d," -"len = %d, size = %d" , err, len, size); +ath3k_log_failed_loading (err, len, size); goto error; }
@@ -351,8 +356,7 @@ static int ath3k_load_fwfile(struct usb_device *udev, err =usb_bulk_msg (udev, pipe, send_buf, size, &len,3000 );if (err || (len != size)) { -BT_ERR ("Error in firmware loading err = %d," -"len = %d, size = %d" , err, len, size); +ath3k_log_failed_loading (err, len, size);kfree (send_buf);return err; }
Signature · 1 line
2.16.1
PATCH v2 1/5 drivers: bluetooth: ath3k: replace hardcode numbers with define
Replaced the numbers with a readable define.
--- drivers/bluetooth/ath3k.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/bluetooth/ath3k.c +5 -4
@@ -227,15 +227,16 @@ static int ath3k_load_firmware(struct usb_device *udev,return -ENOMEM ; } -memcpy (send_buf, firmware->data,20 ); +memcpy (send_buf, firmware->data,FW_HDR_SIZE ); err =usb_control_msg (udev, pipe,USB_REQ_DFU_DNLOAD ,USB_TYPE_VENDOR , -0 ,0 , send_buf,20 ,USB_CTRL_SET_TIMEOUT ); +0 ,0 , send_buf,FW_HDR_SIZE , +USB_CTRL_SET_TIMEOUT );if (err <0 ) {BT_ERR ("Can't change to loading configuration err" ); goto error; } - sent +=20 ; - count -=20 ; + sent +=FW_HDR_SIZE ; + count -=FW_HDR_SIZE ; pipe =usb_sndbulkpipe (udev,0x02 );
Signature · 1 line
2.16.1
PATCH v2 2/5 drivers: bluetooth: ath3k: do not init variables
Do not need to initialize variables, because further on the code they fall into the snprintf.
--- drivers/bluetooth/ath3k.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/bluetooth/ath3k.c +2 -2
@@ -399,7 +399,7 @@ static int ath3k_set_normal_mode(struct usb_device *udev)static int ath3k_load_patch (struct usb_device *udev) {unsigned char fw_state; -char filename[ATH3K_NAME_LEN ] = {0 }; +char filename[ATH3K_NAME_LEN ];const struct firmware *firmware;struct ath3k_version fw_version;__u32 pt_rom_version, pt_build_version;
@@ -452,7 +452,7 @@ static int ath3k_load_patch(struct usb_device *udev)static int ath3k_load_syscfg (struct usb_device *udev) {unsigned char fw_state; -char filename[ATH3K_NAME_LEN ] = {0 }; +char filename[ATH3K_NAME_LEN ];const struct firmware *firmware;struct ath3k_version fw_version;int clk_value, ret;
Signature · 1 line
2.16.1
PATCH v2 3/5 drivers: bluetooth: ath3k: remove blank line after if
In reply to Maxim ZhukovRemoved blank line after if.
--- drivers/bluetooth/ath3k.c | 1 - 1 file changed, 1 deletion(-)
drivers/bluetooth/ath3k.c +0 -1
@@ -523,7 +523,6 @@ static int ath3k_probe(struct usb_interface *intf,/* load patch and sysconfig files for AR3012 */ if (id->driver_info &BTUSB_ATH3012 ) { -/* New firmware with patch and sysconfig files already loaded */ if (le16_to_cpu (udev->descriptor.bcdDevice) >0x0001 )return -ENODEV ;
Signature · 1 line
2.16.1
PATCH v2 4/5 drivers: bluetooth: ath3k: Fix warning: quoted string split across lines
In reply to Maxim ZhukovThis patch avoided the warning:
WARNING: quoted string split across lines
#355: FILE: drivers/bluetooth/ath3k.c:355:
+ BT_ERR("Error in firmware loading err = %d,"
+ "len = %d, size = %d", err, len, size);
This patch fix this issue.
--- drivers/bluetooth/ath3k.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
drivers/bluetooth/ath3k.c +8 -4
@@ -203,6 +203,12 @@ static const struct usb_device_id ath3k_blist_tbl[] = { { }/* Terminating entry */ }; +static inline void ath3k_log_failed_loading (int err,int len,int size) +{ +BT_ERR ("Error in firmware loading err = %d, len = %d, size = %d" , + err, len, size); +} +#define USB_REQ_DFU_DNLOAD 1#define BULK_SIZE 4096#define FW_HDR_SIZE 20
@@ -251,8 +257,7 @@ static int ath3k_load_firmware(struct usb_device *udev, &len, 3000);if (err || (len != size)) { -BT_ERR ("Error in firmware loading err = %d," -"len = %d, size = %d" , err, len, size); +ath3k_log_failed_loading (err, len, size); goto error; }
@@ -351,8 +356,7 @@ static int ath3k_load_fwfile(struct usb_device *udev, err =usb_bulk_msg (udev, pipe, send_buf, size, &len,3000 );if (err || (len != size)) { -BT_ERR ("Error in firmware loading err = %d," -"len = %d, size = %d" , err, len, size); +ath3k_log_failed_loading (err, len, size);kfree (send_buf);return err; }
Signature · 1 line
2.16.1
PATCH v2 5/5 drivers: bluetooth: ath3k: fix checkpatch warning
In reply to Maxim ZhukovThis patch fixed warning:
WARNING: Prefer using '"%s...", __func__' to using 'ath3k_disconnect', this function's name, in a string #568: FILE: drivers/bluetooth/ath3k.c:568:
+ BT_DBG("ath3k_disconnect intf %p", intf);
--- drivers/bluetooth/ath3k.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/bluetooth/ath3k.c +1 -1
@@ -569,7 +569,7 @@ static int ath3k_probe(struct usb_interface *intf,static void ath3k_disconnect (struct usb_interface *intf) { -BT_DBG ("ath3k_disconnect intf %p" , intf); +BT_DBG ("%s intf %p" , __func__, intf); }static struct usb_driver ath3k_driver = {
Signature · 1 line
2.16.1
v2 cover lite fixes for ath3k
In reply to Maxim ZhukovSorry for the last series of patches
Maxim Zhukov (5):
drivers: bluetooth: ath3k: replace hardcode numbers with define
drivers: bluetooth: ath3k: do not init variables
drivers: bluetooth: ath3k: remove blank line after if
drivers: bluetooth: ath3k: Fix warning: quoted string split across lines
drivers: bluetooth: ath3k: fix checkpatch warning
drivers/bluetooth/ath3k.c | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-)
Signature · 1 line
2.16.1
PATCH v2 1/5 drivers: bluetooth: ath3k: replace hardcode numbers with define
Replaced the numbers with a readable define.
--- drivers/bluetooth/ath3k.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/bluetooth/ath3k.c +5 -4
@@ -227,15 +227,16 @@ static int ath3k_load_firmware(struct usb_device *udev,return -ENOMEM ; } -memcpy (send_buf, firmware->data,20 ); +memcpy (send_buf, firmware->data,FW_HDR_SIZE ); err =usb_control_msg (udev, pipe,USB_REQ_DFU_DNLOAD ,USB_TYPE_VENDOR , -0 ,0 , send_buf,20 ,USB_CTRL_SET_TIMEOUT ); +0 ,0 , send_buf,FW_HDR_SIZE , +USB_CTRL_SET_TIMEOUT );if (err <0 ) {BT_ERR ("Can't change to loading configuration err" ); goto error; } - sent +=20 ; - count -=20 ; + sent +=FW_HDR_SIZE ; + count -=FW_HDR_SIZE ; pipe =usb_sndbulkpipe (udev,0x02 );
Signature · 1 line
2.16.1
PATCH v2 2/5 drivers: bluetooth: ath3k: do not init variables
In reply to Maxim ZhukovDo not need to initialize variables, because further on the code they fall into the snprintf.
--- drivers/bluetooth/ath3k.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/bluetooth/ath3k.c +2 -2
@@ -399,7 +399,7 @@ static int ath3k_set_normal_mode(struct usb_device *udev)static int ath3k_load_patch (struct usb_device *udev) {unsigned char fw_state; -char filename[ATH3K_NAME_LEN ] = {0 }; +char filename[ATH3K_NAME_LEN ];const struct firmware *firmware;struct ath3k_version fw_version;__u32 pt_rom_version, pt_build_version;
@@ -452,7 +452,7 @@ static int ath3k_load_patch(struct usb_device *udev)static int ath3k_load_syscfg (struct usb_device *udev) {unsigned char fw_state; -char filename[ATH3K_NAME_LEN ] = {0 }; +char filename[ATH3K_NAME_LEN ];const struct firmware *firmware;struct ath3k_version fw_version;int clk_value, ret;
Signature · 1 line
2.16.1
PATCH v2 3/5 drivers: bluetooth: ath3k: remove blank line after if
In reply to Maxim ZhukovRemoved blank line after if.
--- drivers/bluetooth/ath3k.c | 1 - 1 file changed, 1 deletion(-)
drivers/bluetooth/ath3k.c +0 -1
@@ -523,7 +523,6 @@ static int ath3k_probe(struct usb_interface *intf,/* load patch and sysconfig files for AR3012 */ if (id->driver_info &BTUSB_ATH3012 ) { -/* New firmware with patch and sysconfig files already loaded */ if (le16_to_cpu (udev->descriptor.bcdDevice) >0x0001 )return -ENODEV ;
Signature · 1 line
2.16.1
PATCH v2 4/5 drivers: bluetooth: ath3k: Fix warning: quoted string split across lines
In reply to Maxim ZhukovThis patch avoided the warning:
WARNING: quoted string split across lines
#355: FILE: drivers/bluetooth/ath3k.c:355:
+ BT_ERR("Error in firmware loading err = %d,"
+ "len = %d, size = %d", err, len, size);
This patch fix this issue.
--- drivers/bluetooth/ath3k.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
drivers/bluetooth/ath3k.c +8 -4
@@ -203,6 +203,12 @@ static const struct usb_device_id ath3k_blist_tbl[] = { { }/* Terminating entry */ }; +static inline void ath3k_log_failed_loading (int err,int len,int size) +{ +BT_ERR ("Error in firmware loading err = %d, len = %d, size = %d" , + err, len, size); +} +#define USB_REQ_DFU_DNLOAD 1#define BULK_SIZE 4096#define FW_HDR_SIZE 20
@@ -251,8 +257,7 @@ static int ath3k_load_firmware(struct usb_device *udev, &len, 3000);if (err || (len != size)) { -BT_ERR ("Error in firmware loading err = %d," -"len = %d, size = %d" , err, len, size); +ath3k_log_failed_loading (err, len, size); goto error; }
@@ -351,8 +356,7 @@ static int ath3k_load_fwfile(struct usb_device *udev, err =usb_bulk_msg (udev, pipe, send_buf, size, &len,3000 );if (err || (len != size)) { -BT_ERR ("Error in firmware loading err = %d," -"len = %d, size = %d" , err, len, size); +ath3k_log_failed_loading (err, len, size);kfree (send_buf);return err; }
Signature · 1 line
2.16.1
PATCH v2 5/5 drivers: bluetooth: ath3k: fix checkpatch warning
In reply to Maxim ZhukovThis patch fixed warning:
WARNING: Prefer using '"%s...", __func__' to using 'ath3k_disconnect', this function's name, in a string #568: FILE: drivers/bluetooth/ath3k.c:568:
+ BT_DBG("ath3k_disconnect intf %p", intf);
--- drivers/bluetooth/ath3k.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/bluetooth/ath3k.c +1 -1
@@ -569,7 +569,7 @@ static int ath3k_probe(struct usb_interface *intf,static void ath3k_disconnect (struct usb_interface *intf) { -BT_DBG ("ath3k_disconnect intf %p" , intf); +BT_DBG ("%s intf %p" , __func__, intf); }static struct usb_driver ath3k_driver = {
Signature · 1 line
2.16.1
Marcel Holtmann
maintainerRe: [PATCH v2 0/5] lite fixes for ath3k
In reply to Maxim ZhukovHi Maxim,
Quoted 11 lines
Sorry for the last series of patches
Maxim Zhukov (5):
drivers: bluetooth: ath3k: replace hardcode numbers with define
drivers: bluetooth: ath3k: do not init variables
drivers: bluetooth: ath3k: remove blank line after if
drivers: bluetooth: ath3k: Fix warning: quoted string split across lines
drivers: bluetooth: ath3k: fix checkpatch warning
drivers/bluetooth/ath3k.c| 28 ++++++++++++++++------------1 file changed, 16 insertions(+), 12 deletions(-)
all 5 patches have been applied to bluetooth-next tree.
Regards
Marcel
PATCH v2 5/5 drivers: bluetooth: ath3k: fix
In reply to Maxim ZhukovThis patch fixed warning:
WARNING: Prefer using '"%s...", __func__' to using 'ath3k_disconnect', this function's name, in a string #568: FILE: drivers/bluetooth/ath3k.c:568:
+ BT_DBG("ath3k_disconnect intf %p", intf);
--- drivers/bluetooth/ath3k.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/bluetooth/ath3k.c +1 -1
@@ -569,7 +569,7 @@ static int ath3k_probe(struct usb_interface *intf,static void ath3k_disconnect (struct usb_interface *intf) { -BT_DBG ("ath3k_disconnect intf %p" , intf); +BT_DBG ("%s intf %p" , __func__, intf); }static struct usb_driver ath3k_driver = {
Signature · 1 line
2.16.1