Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3e0ac12a authored by Marcel Holtmann's avatar Marcel Holtmann
Browse files

Bluetooth: hci_uart: Use generic functionality from Broadcom module 



The new Broadcom Bluetooth support module provides generic functionality
for changing and checking the Bluetooth device address. Use these new
features instead of keeping a duplicate in the driver.

Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
parent 1df1f591

drivers/bluetooth/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -111,6 +111,7 @@ config BT_HCIUART_INTEL 
config BT_HCIUART_BCM

	bool "Broadcom protocol support"

	depends on BT_HCIUART

	select BT_BCM

	help

	  The Broadcom protocol support enables Bluetooth HCI over serial

	  port interface for Broadcom Bluetooth controllers.

drivers/bluetooth/hci_bcm.c

+0 −17
Original line number Diff line number Diff line
@@ -29,20 +29,3 @@ 
#include <net/bluetooth/hci_core.h>



#include "hci_uart.h"
 


int bcm_set_bdaddr(struct hci_dev *hdev, const bdaddr_t *bdaddr)

{

	struct sk_buff *skb;

	int err;



	skb = __hci_cmd_sync(hdev, 0xfc01, 6, bdaddr, HCI_INIT_TIMEOUT);

	if (IS_ERR(skb)) {

		err = PTR_ERR(skb);

		BT_ERR("%s: BCM: Change address command failed (%d)",

		       hdev->name, err);

		return err;

	}

	kfree_skb(skb);



	return 0;

}

drivers/bluetooth/hci_ldisc.c

+3 −1
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ 
#include <net/bluetooth/bluetooth.h>

#include <net/bluetooth/hci_core.h>



#include "btbcm.h"

#include "hci_uart.h"



#define VERSION "2.3"
@@ -299,7 +300,8 @@ static int hci_uart_setup(struct hci_dev *hdev) 
#endif

#ifdef CONFIG_BT_HCIUART_BCM

	case 15:

		hdev->set_bdaddr = bcm_set_bdaddr;

		hdev->set_bdaddr = btbcm_set_bdaddr;

		btbcm_check_bdaddr(hdev);

		break;

#endif

	}

drivers/bluetooth/hci_uart.h

+0 −4
Original line number Diff line number Diff line
@@ -128,7 +128,3 @@ int h5_deinit(void); 
#ifdef CONFIG_BT_HCIUART_INTEL

int intel_set_bdaddr(struct hci_dev *hdev, const bdaddr_t *bdaddr);

#endif
 


#ifdef CONFIG_BT_HCIUART_BCM

int bcm_set_bdaddr(struct hci_dev *hdev, const bdaddr_t *bdaddr);

#endif