On Fri, Jul 20, 2018 at 07:02:39PM +0530, Balakrishna Godavarthi wrote:
> Redefinition of qca_uart_setup will help future Qualcomm Bluetooth
> SoC, to use the same function instead of duplicating the function.
> Added new arguments soc_type and soc_ver to the functions.
>
> These arguments will help to decide type of firmware files
> to be loaded into Bluetooth chip.
> soc_type holds the Bluetooth chip connected to APPS processor.
> soc_ver holds the Bluetooth chip version.
>
> Signed-off-by: Balakrishna Godavarthi <bgoda...@codeaurora.org>
> Reviewed-by: Matthias Kaehlcke <m...@chromium.org>
> ---
> drivers/bluetooth/btqca.c | 20 +++++++-------------
> drivers/bluetooth/btqca.h | 13 +++++++++++--
> drivers/bluetooth/hci_qca.c | 10 +++++++++-
> 3 files changed, 27 insertions(+), 16 deletions(-)
>
> diff --git a/drivers/bluetooth/btqca.c b/drivers/bluetooth/btqca.c
> index c5cf9cab438a..b556710ee1bd 100644
> --- a/drivers/bluetooth/btqca.c
> +++ b/drivers/bluetooth/btqca.c
> @@ -85,6 +85,9 @@ int qca_read_soc_version(struct hci_dev *hdev, u32
> *soc_version)
> out:
> kfree_skb(skb);
>
> + if (err < 0 || *soc_version == 0)
> + bt_dev_err(hdev, "QCA Failed to get version (%d)", err);
You also have to set 'err' if soc_version is 0, so the caller can skip
the check for soc_version == 0
I'd suggest:
// directly after setting soc_version
if (*soc_version == 0)
err = -EILSEQ; // or should it be a different error code?
...
if (err)
bt_dev_err(hdev, "QCA Failed to get version (%d)", err);
You could also limit the error log to the 'if (*soc_version == 0)'
branch, for all other errors there will already be a more specific log
entry.
> +
> return err;
> }
Cheers
Matthias
