On Thu, Oct 25, 2018 at 08:10:30PM +0530, Balakrishna Godavarthi wrote:
> Hi Matthias,
>
> On 2018-10-25 05:51, Matthias Kaehlcke wrote:
> > Use the HCI_QUIRK_USE_BDADDR_PROPERTY quirk to let the HCI
> > core handle the reading of 'local-bd-address'. With this there
> > is no need to set HCI_QUIRK_INVALID_BDADDR, the case of a
> > non-existing or invalid fwnode property is handled by the core
> > code.
> >
> > Signed-off-by: Matthias Kaehlcke <mka@xxxxxxxxxxxx>
> > ---
> > I couldn't actually test the changes in this driver since I
> > don't have a device with this controller. Could someone
> > from Qualcomm help with this?
> > ---
> > drivers/bluetooth/btqcomsmd.c | 28 +++-------------------------
> > 1 file changed, 3 insertions(+), 25 deletions(-)
> >
> > diff --git a/drivers/bluetooth/btqcomsmd.c
> > b/drivers/bluetooth/btqcomsmd.c
> > index 7df3eed1ef5e..e5841602c4f1 100644
> > --- a/drivers/bluetooth/btqcomsmd.c
> > +++ b/drivers/bluetooth/btqcomsmd.c
> > @@ -125,23 +125,10 @@ static int btqcomsmd_setup(struct hci_dev *hdev)
> > return PTR_ERR(skb);
> > kfree_skb(skb);
> >
> > - /* Devices do not have persistent storage for BD address. If no
> > - * BD address has been retrieved during probe, mark the device
> > - * as having an invalid BD address.
> > + /* Devices do not have persistent storage for BD address. Retrieve
> > + * it from the firmware node property.
> > */
> > - if (!bacmp(&btq->bdaddr, BDADDR_ANY)) {
> > - set_bit(HCI_QUIRK_INVALID_BDADDR, &hdev->quirks);
> > - return 0;
> > - }
> > -
> > - /* When setting a configured BD address fails, mark the device
> > - * as having an invalid BD address.
> > - */
> > - err = qca_set_bdaddr_rome(hdev, &btq->bdaddr);
> > - if (err) {
> > - set_bit(HCI_QUIRK_INVALID_BDADDR, &hdev->quirks);
> > - return 0;
> > - }
> > + set_bit(HCI_QUIRK_USE_BDADDR_PROPERTY, &hdev->quirks);
> >
> > return 0;
> > }
> > @@ -169,15 +156,6 @@ static int btqcomsmd_probe(struct platform_device
> > *pdev)
> > if (IS_ERR(btq->cmd_channel))
> > return PTR_ERR(btq->cmd_channel);
> >
> > - /* The local-bd-address property is usually injected by the
> > - * bootloader which has access to the allocated BD address.
> > - */
> > - if (!of_property_read_u8_array(pdev->dev.of_node, "local-bd-address",
> > - (u8 *)&btq->bdaddr, sizeof(bdaddr_t))) {
> > - dev_info(&pdev->dev, "BD address %pMR retrieved from device-tree",
> > - &btq->bdaddr);
> > - }
> > -
> > hdev = hci_alloc_dev();
> > if (!hdev)
> > return -ENOMEM;
>
> nit: can be remove unused "bdaddr_t bdaddr" variable.
> https://elixir.bootlin.com/linux/v4.19-rc8/source/drivers/bluetooth/btqcomsmd.c#L31
> Apart from this, It looks ok to me.
Thanks for the reviews! I'll remove the field in the next revision.
