Bluetooth: ath3k: Fix multiple issues reported by checkpatch.pl
[ Upstream commit 68aa21054ec3a1a313af90a5f95ade16c3326d20 ] This fixes some CHECKs reported by the checkpatch script. Issues reported in ath3k.c: ------- ath3k.c ------- CHECK: Please don't use multiple blank lines + + CHECK: Blank lines aren't necessary after an open brace '{' +static const struct usb_device_id ath3k_blist_tbl[] = { + CHECK: Alignment should match open parenthesis +static int ath3k_load_firmware(struct usb_device *udev, + const struct firmware *firmware) CHECK: Alignment should match open parenthesis + err = usb_bulk_msg(udev, pipe, send_buf, size, + &len, 3000); CHECK: Unnecessary parentheses around 'len != size' + if (err || (len != size)) { CHECK: Alignment should match open parenthesis +static int ath3k_get_version(struct usb_device *udev, + struct ath3k_version *version) CHECK: Alignment should match open parenthesis +static int ath3k_load_fwfile(struct usb_device *udev, + const struct firmware *firmware) CHECK: Alignment should match open parenthesis + err = usb_bulk_msg(udev, pipe, send_buf, size, + &len, 3000); CHECK: Unnecessary parentheses around 'len != size' + if (err || (len != size)) { CHECK: Blank lines aren't necessary after an open brace '{' + switch (fw_version.ref_clock) { + CHECK: Alignment should match open parenthesis + snprintf(filename, ATH3K_NAME_LEN, "ar3k/ramps_0x%08x_%d%s", + le32_to_cpu(fw_version.rom_version), clk_value, ".dfu"); CHECK: Alignment should match open parenthesis +static int ath3k_probe(struct usb_interface *intf, + const struct usb_device_id *id) CHECK: Alignment should match open parenthesis + BT_ERR("Firmware file \"%s\" not found", + ATH3K_FIRMWARE); CHECK: Alignment should match open parenthesis + BT_ERR("Firmware file \"%s\" request failed (err=%d)", + ATH3K_FIRMWARE, ret); total: 0 errors, 0 warnings, 14 checks, 540 lines checked Signed-off-by: Uri Arev <me@wantyapps.xyz> Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Родитель
8f917f517b
Коммит
df8eaae038
|
@ -3,7 +3,6 @@
|
||||||
* Copyright (c) 2008-2009 Atheros Communications Inc.
|
* Copyright (c) 2008-2009 Atheros Communications Inc.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
#include <linux/module.h>
|
#include <linux/module.h>
|
||||||
#include <linux/kernel.h>
|
#include <linux/kernel.h>
|
||||||
#include <linux/init.h>
|
#include <linux/init.h>
|
||||||
|
@ -129,7 +128,6 @@ MODULE_DEVICE_TABLE(usb, ath3k_table);
|
||||||
* for AR3012
|
* for AR3012
|
||||||
*/
|
*/
|
||||||
static const struct usb_device_id ath3k_blist_tbl[] = {
|
static const struct usb_device_id ath3k_blist_tbl[] = {
|
||||||
|
|
||||||
/* Atheros AR3012 with sflash firmware*/
|
/* Atheros AR3012 with sflash firmware*/
|
||||||
{ USB_DEVICE(0x0489, 0xe04e), .driver_info = BTUSB_ATH3012 },
|
{ USB_DEVICE(0x0489, 0xe04e), .driver_info = BTUSB_ATH3012 },
|
||||||
{ USB_DEVICE(0x0489, 0xe04d), .driver_info = BTUSB_ATH3012 },
|
{ USB_DEVICE(0x0489, 0xe04d), .driver_info = BTUSB_ATH3012 },
|
||||||
|
@ -203,7 +201,7 @@ static inline void ath3k_log_failed_loading(int err, int len, int size,
|
||||||
#define TIMEGAP_USEC_MAX 100
|
#define TIMEGAP_USEC_MAX 100
|
||||||
|
|
||||||
static int ath3k_load_firmware(struct usb_device *udev,
|
static int ath3k_load_firmware(struct usb_device *udev,
|
||||||
const struct firmware *firmware)
|
const struct firmware *firmware)
|
||||||
{
|
{
|
||||||
u8 *send_buf;
|
u8 *send_buf;
|
||||||
int len = 0;
|
int len = 0;
|
||||||
|
@ -238,9 +236,9 @@ static int ath3k_load_firmware(struct usb_device *udev,
|
||||||
memcpy(send_buf, firmware->data + sent, size);
|
memcpy(send_buf, firmware->data + sent, size);
|
||||||
|
|
||||||
err = usb_bulk_msg(udev, pipe, send_buf, size,
|
err = usb_bulk_msg(udev, pipe, send_buf, size,
|
||||||
&len, 3000);
|
&len, 3000);
|
||||||
|
|
||||||
if (err || (len != size)) {
|
if (err || len != size) {
|
||||||
ath3k_log_failed_loading(err, len, size, count);
|
ath3k_log_failed_loading(err, len, size, count);
|
||||||
goto error;
|
goto error;
|
||||||
}
|
}
|
||||||
|
@ -263,7 +261,7 @@ static int ath3k_get_state(struct usb_device *udev, unsigned char *state)
|
||||||
}
|
}
|
||||||
|
|
||||||
static int ath3k_get_version(struct usb_device *udev,
|
static int ath3k_get_version(struct usb_device *udev,
|
||||||
struct ath3k_version *version)
|
struct ath3k_version *version)
|
||||||
{
|
{
|
||||||
return usb_control_msg_recv(udev, 0, ATH3K_GETVERSION,
|
return usb_control_msg_recv(udev, 0, ATH3K_GETVERSION,
|
||||||
USB_TYPE_VENDOR | USB_DIR_IN, 0, 0,
|
USB_TYPE_VENDOR | USB_DIR_IN, 0, 0,
|
||||||
|
@ -272,7 +270,7 @@ static int ath3k_get_version(struct usb_device *udev,
|
||||||
}
|
}
|
||||||
|
|
||||||
static int ath3k_load_fwfile(struct usb_device *udev,
|
static int ath3k_load_fwfile(struct usb_device *udev,
|
||||||
const struct firmware *firmware)
|
const struct firmware *firmware)
|
||||||
{
|
{
|
||||||
u8 *send_buf;
|
u8 *send_buf;
|
||||||
int len = 0;
|
int len = 0;
|
||||||
|
@ -311,8 +309,8 @@ static int ath3k_load_fwfile(struct usb_device *udev,
|
||||||
memcpy(send_buf, firmware->data + sent, size);
|
memcpy(send_buf, firmware->data + sent, size);
|
||||||
|
|
||||||
err = usb_bulk_msg(udev, pipe, send_buf, size,
|
err = usb_bulk_msg(udev, pipe, send_buf, size,
|
||||||
&len, 3000);
|
&len, 3000);
|
||||||
if (err || (len != size)) {
|
if (err || len != size) {
|
||||||
ath3k_log_failed_loading(err, len, size, count);
|
ath3k_log_failed_loading(err, len, size, count);
|
||||||
kfree(send_buf);
|
kfree(send_buf);
|
||||||
return err;
|
return err;
|
||||||
|
@ -426,7 +424,6 @@ static int ath3k_load_syscfg(struct usb_device *udev)
|
||||||
}
|
}
|
||||||
|
|
||||||
switch (fw_version.ref_clock) {
|
switch (fw_version.ref_clock) {
|
||||||
|
|
||||||
case ATH3K_XTAL_FREQ_26M:
|
case ATH3K_XTAL_FREQ_26M:
|
||||||
clk_value = 26;
|
clk_value = 26;
|
||||||
break;
|
break;
|
||||||
|
@ -442,7 +439,7 @@ static int ath3k_load_syscfg(struct usb_device *udev)
|
||||||
}
|
}
|
||||||
|
|
||||||
snprintf(filename, ATH3K_NAME_LEN, "ar3k/ramps_0x%08x_%d%s",
|
snprintf(filename, ATH3K_NAME_LEN, "ar3k/ramps_0x%08x_%d%s",
|
||||||
le32_to_cpu(fw_version.rom_version), clk_value, ".dfu");
|
le32_to_cpu(fw_version.rom_version), clk_value, ".dfu");
|
||||||
|
|
||||||
ret = request_firmware(&firmware, filename, &udev->dev);
|
ret = request_firmware(&firmware, filename, &udev->dev);
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
|
@ -457,7 +454,7 @@ static int ath3k_load_syscfg(struct usb_device *udev)
|
||||||
}
|
}
|
||||||
|
|
||||||
static int ath3k_probe(struct usb_interface *intf,
|
static int ath3k_probe(struct usb_interface *intf,
|
||||||
const struct usb_device_id *id)
|
const struct usb_device_id *id)
|
||||||
{
|
{
|
||||||
const struct firmware *firmware;
|
const struct firmware *firmware;
|
||||||
struct usb_device *udev = interface_to_usbdev(intf);
|
struct usb_device *udev = interface_to_usbdev(intf);
|
||||||
|
@ -506,10 +503,10 @@ static int ath3k_probe(struct usb_interface *intf,
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
if (ret == -ENOENT)
|
if (ret == -ENOENT)
|
||||||
BT_ERR("Firmware file \"%s\" not found",
|
BT_ERR("Firmware file \"%s\" not found",
|
||||||
ATH3K_FIRMWARE);
|
ATH3K_FIRMWARE);
|
||||||
else
|
else
|
||||||
BT_ERR("Firmware file \"%s\" request failed (err=%d)",
|
BT_ERR("Firmware file \"%s\" request failed (err=%d)",
|
||||||
ATH3K_FIRMWARE, ret);
|
ATH3K_FIRMWARE, ret);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче