2014-04-15 20:00:00

by Petri Gynther

[permalink] [raw]
Subject: [PATCH] Bluetooth: btmrvl: Fix btmrvl_send_module_cfg_cmd()

Change subcmd parameter from int to u8 to match its use:
btmrvl_send_sync_cmd(priv, BT_CMD_MODULE_CFG_REQ, &subcmd, 1);

Signed-off-by: Petri Gynther <[email protected]>
---
drivers/bluetooth/btmrvl_drv.h | 2 +-
drivers/bluetooth/btmrvl_main.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/bluetooth/btmrvl_drv.h b/drivers/bluetooth/btmrvl_drv.h
index 199ff49..dc79f88 100644
--- a/drivers/bluetooth/btmrvl_drv.h
+++ b/drivers/bluetooth/btmrvl_drv.h
@@ -142,7 +142,7 @@ void btmrvl_interrupt(struct btmrvl_private *priv);
bool btmrvl_check_evtpkt(struct btmrvl_private *priv, struct sk_buff *skb);
int btmrvl_process_event(struct btmrvl_private *priv, struct sk_buff *skb);

-int btmrvl_send_module_cfg_cmd(struct btmrvl_private *priv, int subcmd);
+int btmrvl_send_module_cfg_cmd(struct btmrvl_private *priv, u8 subcmd);
int btmrvl_send_hscfg_cmd(struct btmrvl_private *priv);
int btmrvl_enable_ps(struct btmrvl_private *priv);
int btmrvl_prepare_command(struct btmrvl_private *priv);
diff --git a/drivers/bluetooth/btmrvl_main.c b/drivers/bluetooth/btmrvl_main.c
index 5c0b944..e9dbddb 100644
--- a/drivers/bluetooth/btmrvl_main.c
+++ b/drivers/bluetooth/btmrvl_main.c
@@ -202,7 +202,7 @@ static int btmrvl_send_sync_cmd(struct btmrvl_private *priv, u16 opcode,
return 0;
}

-int btmrvl_send_module_cfg_cmd(struct btmrvl_private *priv, int subcmd)
+int btmrvl_send_module_cfg_cmd(struct btmrvl_private *priv, u8 subcmd)
{
int ret;

--
1.9.1.423.g4596e3a



2014-04-22 07:55:22

by Johan Hedberg

[permalink] [raw]
Subject: Re: [PATCH] Bluetooth: btmrvl: Fix btmrvl_send_module_cfg_cmd()

Hi Petri,

On Tue, Apr 15, 2014, Petri Gynther wrote:
> Change subcmd parameter from int to u8 to match its use:
> btmrvl_send_sync_cmd(priv, BT_CMD_MODULE_CFG_REQ, &subcmd, 1);
>
> Signed-off-by: Petri Gynther <[email protected]>
> ---
> drivers/bluetooth/btmrvl_drv.h | 2 +-
> drivers/bluetooth/btmrvl_main.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)

Applied to bluetooth-next. Thanks.

Johan

2014-04-16 03:45:53

by Bing Zhao

[permalink] [raw]
Subject: RE: [PATCH] Bluetooth: btmrvl: Fix btmrvl_send_module_cfg_cmd()

Hi,

> Change subcmd parameter from int to u8 to match its use:
> btmrvl_send_sync_cmd(priv, BT_CMD_MODULE_CFG_REQ, &subcmd, 1);
>
> Signed-off-by: Petri Gynther <[email protected]>

This patch looks good to me, feel free to add:

Reviewed-by: Bing Zhao <[email protected]>

Thanks,
Bing

> ---
> drivers/bluetooth/btmrvl_drv.h | 2 +-
> drivers/bluetooth/btmrvl_main.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/bluetooth/btmrvl_drv.h b/drivers/bluetooth/btmrvl_drv.h
> index 199ff49..dc79f88 100644
> --- a/drivers/bluetooth/btmrvl_drv.h
> +++ b/drivers/bluetooth/btmrvl_drv.h
> @@ -142,7 +142,7 @@ void btmrvl_interrupt(struct btmrvl_private *priv);
> bool btmrvl_check_evtpkt(struct btmrvl_private *priv, struct sk_buff *skb);
> int btmrvl_process_event(struct btmrvl_private *priv, struct sk_buff *skb);
>
> -int btmrvl_send_module_cfg_cmd(struct btmrvl_private *priv, int subcmd);
> +int btmrvl_send_module_cfg_cmd(struct btmrvl_private *priv, u8 subcmd);
> int btmrvl_send_hscfg_cmd(struct btmrvl_private *priv);
> int btmrvl_enable_ps(struct btmrvl_private *priv);
> int btmrvl_prepare_command(struct btmrvl_private *priv);
> diff --git a/drivers/bluetooth/btmrvl_main.c b/drivers/bluetooth/btmrvl_main.c
> index 5c0b944..e9dbddb 100644
> --- a/drivers/bluetooth/btmrvl_main.c
> +++ b/drivers/bluetooth/btmrvl_main.c
> @@ -202,7 +202,7 @@ static int btmrvl_send_sync_cmd(struct btmrvl_private *priv, u16 opcode,
> return 0;
> }
>
> -int btmrvl_send_module_cfg_cmd(struct btmrvl_private *priv, int subcmd)
> +int btmrvl_send_module_cfg_cmd(struct btmrvl_private *priv, u8 subcmd)
> {
> int ret;
>
> --
> 1.9.1.423.g4596e3a