commit fba8793c48774a86366ef0b56e4a6948eb7c7702
author Henry Herman <henryherman@google.com> Tue Jun 18 11:24:16 2019 -0700
committer Henry Herman <henryherman@google.com> Tue Jun 18 14:33:00 2019 -0700
tree 7796d5c9333f252716a02a955c278b13fb013e10
parent 8024323023165959e64221f776b9ca8ba9b7734a

Clean up support for Kernel 4.4

Change-Id: I9045aedc01f2caab6aaab807ffc93cc6fa0fbdbf

.gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..5a315c9
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,10 @@
+*.o.cmd
+*.o
+*.ko.cmd
+*.ko
+*.mod.c
+modules.order
+Module.symvers
+.tmp*
+*.swp
+*.swo

btmtk_sdio.c

diff --git a/btmtk_sdio.c b/btmtk_sdio.c
index 1f571ca..3f7f9ae 100644
--- a/btmtk_sdio.c
+++ b/btmtk_sdio.c
@@ -54,7 +54,7 @@
 void sdio_card_detect(int card_present);
 #endif
 
-#if SUPPORT_BT_STEREO
+#ifdef SUPPORT_BT_STEREO
 #include <linux/of.h>
 #include <linux/of_irq.h>
 struct bt_stereo_clk stereo_clk;
@@ -2248,7 +2248,7 @@
 FW_DONE:
 #endif
 
-#if SUPPORT_BT_STEREO
+#ifdef SUPPORT_BT_STEREO
 	if (rxbuf[SDIO_HEADER_LEN] == 0x04
 			&& rxbuf[SDIO_HEADER_LEN+1] == 0x0E
 			&& rxbuf[SDIO_HEADER_LEN+2] == 0x04
@@ -2423,12 +2423,17 @@
 			skb_put(skb_hci, buf_len);
 
 			memcpy(skb_hci->data, fops_skb->data, buf_len);
+
+#if KERNEL_VERSION(4, 5, 0) > LINUX_VERSION_CODE
+			bt_cb((skb_hci))->pkt_type = type;
+#else
 			hci_skb_pkt_type(skb_hci) = type;
+#endif
 
 			ret = hci_recv_frame(hdev, skb_hci);
 			if (ret < 0)
 				printk(KERN_ERR "XXX: error recv frame: %d\n", ret);
-		}
+			}
 
 		fops_skb->len = buf_len;
 		lock_unsleepable_lock(&(metabuffer.spin_lock));
@@ -2913,7 +2918,7 @@
 }
 #endif
 
-#if SUPPORT_BT_STEREO
+#ifdef SUPPORT_BT_STEREO
 static int btmtk_stereo_irq_handler(int irq, void *dev)
 {
 	/* Get sys clk */
@@ -3108,7 +3113,7 @@
 	wake_lock_init(&g_card->eint_wlock, WAKE_LOCK_SUSPEND, "btevent_eint");
 #endif
 
-#if SUPPORT_BT_STEREO
+#ifdef SUPPORT_BT_STEREO
 	btmtk_stereo_reg_irq();
 #endif
 
@@ -3159,7 +3164,7 @@
 	hci_unregister_dev(hdev);
 	hci_free_dev(hdev);
 
-#if SUPPORT_BT_STEREO
+#ifdef SUPPORT_BT_STEREO
 	btmtk_stereo_unreg_irq();
 #endif
 
@@ -4164,7 +4169,7 @@
 	u32 ret = 0;
 	int err = 0;
 
-#if SUPPORT_BT_STEREO
+#ifdef SUPPORT_BT_STEREO
 	int cnt = 0;
 	struct bt_stereo_para stereo_para;
 	struct sk_buff *skb = NULL;
@@ -4180,7 +4185,7 @@
 #endif
 
 	switch(cmd) {
-#if SUPPORT_BT_STEREO
+#ifdef SUPPORT_BT_STEREO
 	case BTMTK_IOCTL_STEREO_GET_CLK:
 		pr_debug("%s: BTMTK_IOCTL_STEREO_GET_CLK cmd\n", __func__);
 		for (cnt = 100; cnt > 0; cnt--) {

btmtk_sdio.h

diff --git a/btmtk_sdio.h b/btmtk_sdio.h
index 7dc3782..6c1fe33 100644
--- a/btmtk_sdio.h
+++ b/btmtk_sdio.h
@@ -329,13 +329,13 @@
 
 #define BTMTK_IOCTL_MAGIC 'k'
 
-#if SUPPORT_BT_STEREO
+#ifdef SUPPORT_BT_STEREO
 #define BTMTK_IOCTL_STEREO_GET_CLK _IOR(BTMTK_IOCTL_MAGIC, 1, void *)
 #define BTMTK_IOCTL_STEREO_SET_PARA _IOW(BTMTK_IOCTL_MAGIC, 2, void *)
 #endif
 
 
-#if SUPPORT_BT_STEREO
+#ifdef SUPPORT_BT_STEREO
 struct bt_stereo_clk {
 	u64 sys_clk;
 	u64 fw_clk;