[PATCH 1/2] Bluetooth: btbcm: Fix coding style

[PATCH 1/2] Bluetooth: btbcm: Fix coding style

[Frederic Danis]

space required after that close brace '}'
reported by checkpatch.pl

Signed-off-by: Frederic Danis <frederic.danis@linux.intel.com>
---
 drivers/bluetooth/btbcm.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/bluetooth/btbcm.c b/drivers/bluetooth/btbcm.c
index 9ceb8ac..9d699dd 100644
--- a/drivers/bluetooth/btbcm.c
+++ b/drivers/bluetooth/btbcm.c
@@ -32,8 +32,8 @@
 
 #define VERSION "0.1"
 
-#define BDADDR_BCM20702A0 (&(bdaddr_t) {{0x00, 0xa0, 0x02, 0x70, 0x20, 0x00}})
-#define BDADDR_BCM4324B3 (&(bdaddr_t) {{0x00, 0x00, 0x00, 0xb3, 0x24, 0x43}})
+#define BDADDR_BCM20702A0 (&(bdaddr_t){ {0x00, 0xa0, 0x02, 0x70, 0x20, 0x00} })
+#define BDADDR_BCM4324B3 (&(bdaddr_t){ {0x00, 0x00, 0x00, 0xb3, 0x24, 0x43} })
 
 int btbcm_check_bdaddr(struct hci_dev *hdev)
 {
-- 
1.9.1

[PATCH 2/2] Bluetooth: btbcm: Add BCM4330B1 UART device

[Frederic Danis]

Add "waiting for configuration" address.
Add lmp_subver and firmware name for BCM4330B1 controller.

Signed-off-by: Frederic Danis <frederic.danis@linux.intel.com>
---
 drivers/bluetooth/btbcm.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/drivers/bluetooth/btbcm.c b/drivers/bluetooth/btbcm.c
index 9d699dd..2fbbbea 100644
--- a/drivers/bluetooth/btbcm.c
+++ b/drivers/bluetooth/btbcm.c
@@ -34,6 +34,7 @@
 
 #define BDADDR_BCM20702A0 (&(bdaddr_t){ {0x00, 0xa0, 0x02, 0x70, 0x20, 0x00} })
 #define BDADDR_BCM4324B3 (&(bdaddr_t){ {0x00, 0x00, 0x00, 0xb3, 0x24, 0x43} })
+#define BDADDR_BCM4330B1 (&(bdaddr_t){ {0x00, 0x00, 0x00, 0xb1, 0x30, 0x43} })
 
 int btbcm_check_bdaddr(struct hci_dev *hdev)
 {
@@ -66,9 +67,13 @@ int btbcm_check_bdaddr(struct hci_dev *hdev)
 	 *
 	 * The address 43:24:B3:00:00:00 indicates a BCM4324B3 controller
 	 * with waiting for configuration state.
+	 *
+	 * The address 43:30:B1:00:00:00 indicates a BCM4330B1 controller
+	 * with waiting for configuration state.
 	 */
 	if (!bacmp(&bda->bdaddr, BDADDR_BCM20702A0) ||
-	    !bacmp(&bda->bdaddr, BDADDR_BCM4324B3)) {
+	    !bacmp(&bda->bdaddr, BDADDR_BCM4324B3) ||
+	    !bacmp(&bda->bdaddr, BDADDR_BCM4330B1)) {
 		BT_INFO("%s: BCM: Using default device address (%pMR)",
 			hdev->name, &bda->bdaddr);
 		set_bit(HCI_QUIRK_INVALID_BDADDR, &hdev->quirks);
@@ -241,6 +246,7 @@ static const struct {
 	u16 subver;
 	const char *name;
 } bcm_uart_subver_table[] = {
+	{ 0x4103, "BCM4330B1"	},	/* 002.001.003 */
 	{ 0x410e, "BCM43341B0"	},	/* 002.001.014 */
 	{ 0x4406, "BCM4324B3"	},	/* 002.004.006 */
 	{ 0x610c, "BCM4354"	},	/* 003.001.012 */
-- 
1.9.1

Re: [PATCH 1/2] Bluetooth: btbcm: Fix coding style

[Marcel Holtmann]

Hi Fred,

> space required after that close brace '}'
> reported by checkpatch.pl
> 
> Signed-off-by: Frederic Danis <frederic.danis@linux.intel.com>
> ---
> drivers/bluetooth/btbcm.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/bluetooth/btbcm.c b/drivers/bluetooth/btbcm.c
> index 9ceb8ac..9d699dd 100644
> --- a/drivers/bluetooth/btbcm.c
> +++ b/drivers/bluetooth/btbcm.c
> @@ -32,8 +32,8 @@
> 
> #define VERSION "0.1"
> 
> -#define BDADDR_BCM20702A0 (&(bdaddr_t) {{0x00, 0xa0, 0x02, 0x70, 0x20, 0x00}})
> -#define BDADDR_BCM4324B3 (&(bdaddr_t) {{0x00, 0x00, 0x00, 0xb3, 0x24, 0x43}})
> +#define BDADDR_BCM20702A0 (&(bdaddr_t){ {0x00, 0xa0, 0x02, 0x70, 0x20, 0x00} })
> +#define BDADDR_BCM4324B3 (&(bdaddr_t){ {0x00, 0x00, 0x00, 0xb3, 0x24, 0x43} })

lets drop this patch. I am not going to listen to checkpatch.pl in this case.

Regards

Marcel