From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 77B8AC282DB for ; Thu, 31 Jan 2019 22:10:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4A21A2087F for ; Thu, 31 Jan 2019 22:10:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729499AbfAaWKn (ORCPT ); Thu, 31 Jan 2019 17:10:43 -0500 Received: from mail-pf1-f193.google.com ([209.85.210.193]:36796 "EHLO mail-pf1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726284AbfAaWKk (ORCPT ); Thu, 31 Jan 2019 17:10:40 -0500 Received: by mail-pf1-f193.google.com with SMTP id b85so2125683pfc.3 for ; Thu, 31 Jan 2019 14:10:40 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=MDsJAKRlQtLh60IXR2XWYXCkDcr4tFYMn0YByw5WQpc=; b=rx563P5KQMNMMhJgdeJrOX5Uxgh53EhD7QeBSOAuj9Ai+tNB1JZOZV+EuZWof9pPkX 1n7PxUonpStQE3rkdBLtKw4goC7+utN3ZTatADN5vYNiRUlu41sIWI8chqTRD7l11CX3 w8NIWDjF+SWubC92XaIHO0T3g/3YRZV2v00QC37YUvmGQcWb9y4qiTJv0s5eD1dxOEAj 7pYqYLTtvSEpZA310wT0gGc06d4IbDkGlx5ra4EknYc3QuZKY8dvQgnPwHaS9XpXyGe2 oxYvNI+duFo2xO16tDfpE4C8IhUolrtkh3dx43iIekAtCgb72dDRf7efRCIjoi/k7+cZ msAg== X-Gm-Message-State: AJcUukeMtRE6QcTuGHzdBrbQp6LwOP0ISQ2wwQdgd9JXHSEa3pQO7iyL XkIFH4/sX9Jna6Hz/bT+8BIfcA== X-Google-Smtp-Source: ALg8bN4dhdgXpPjHFQ7etICF8e57z74trsweGoVCOS+h7VoL9q6Gf6sIHberUsHju+2lZKHZb+rEPA== X-Received: by 2002:a63:1f4e:: with SMTP id q14mr31754109pgm.88.1548972639803; Thu, 31 Jan 2019 14:10:39 -0800 (PST) Received: from mka.mtv.corp.google.com ([2620:15c:202:1:75a:3f6e:21d:9374]) by smtp.gmail.com with ESMTPSA id r80sm10279879pfa.111.2019.01.31.14.10.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 31 Jan 2019 14:10:38 -0800 (PST) From: Matthias Kaehlcke To: Marcel Holtmann , Johan Hedberg , "David S . Miller" , Loic Poulain Cc: linux-bluetooth@vger.kernel.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, Balakrishna Godavarthi , Matthias Kaehlcke Subject: [PATCH RESEND 2/3] Bluetooth: btqcomsmd: use HCI_QUIRK_USE_BDADDR_PROPERTY Date: Thu, 31 Jan 2019 14:10:20 -0800 Message-Id: <20190131221021.176809-3-mka@chromium.org> X-Mailer: git-send-email 2.20.1.495.gaa96b0ce6b-goog In-Reply-To: <20190131221021.176809-1-mka@chromium.org> References: <20190131221021.176809-1-mka@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Reviewed-by: Balakrishna Godavarthi --- Changes in v3: - none Changes in v2: - removed now unused field 'bdaddr' from struct btqcomsmd - added 'Reviewed-by: Balakrishna Godavarthi ' tag --- drivers/bluetooth/btqcomsmd.c | 29 +++-------------------------- 1 file changed, 3 insertions(+), 26 deletions(-) diff --git a/drivers/bluetooth/btqcomsmd.c b/drivers/bluetooth/btqcomsmd.c index 7df3eed1ef5e9..b3020fab6c8e3 100644 --- a/drivers/bluetooth/btqcomsmd.c +++ b/drivers/bluetooth/btqcomsmd.c @@ -28,7 +28,6 @@ struct btqcomsmd { struct hci_dev *hdev; - bdaddr_t bdaddr; struct rpmsg_endpoint *acl_channel; struct rpmsg_endpoint *cmd_channel; }; @@ -125,23 +124,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 +155,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; -- 2.20.1.495.gaa96b0ce6b-goog