From 07694d213b343410cd3c7461f54ab29d2027fd88 Mon Sep 17 00:00:00 2001
From: Philippe Langlais <philippe.langlais@stericsson.com>
Date: Mon, 30 Jan 2012 13:00:01 +0100
Subject: cg2900: Changes for porting on 3.3

Signed-off-by: Philippe Langlais <philippe.langlais@stericsson.com>
---
 drivers/staging/cg2900/bluetooth/btcg2900.c  | 12 ++----------
 drivers/staging/cg2900/bluetooth/hci_ldisc.c |  2 +-
 drivers/staging/cg2900/board-ux500-cg2900.c  |  2 +-
 drivers/staging/cg2900/devices-cg2900.c      |  1 -
 4 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/drivers/staging/cg2900/bluetooth/btcg2900.c b/drivers/staging/cg2900/bluetooth/btcg2900.c
index ce1e5a4e3d5..07aae9a32ca 100644
--- a/drivers/staging/cg2900/bluetooth/btcg2900.c
+++ b/drivers/staging/cg2900/bluetooth/btcg2900.c
@@ -434,13 +434,7 @@ static void hci_reset_cb(struct cg2900_user_data *dev)
 	 * in turn be called by BlueZ.
 	 */
 	BT_DBG("Deregister HCI device");
-	err = hci_unregister_dev(info->hdev);
-	if (err)
-		BT_ERR(NAME "Can not deregister HCI device! (%d)", err);
-		/*
-		 * Now we are in trouble. Try to register a new hdev
-		 * anyway even though this will cost some memory.
-		 */
+	hci_unregister_dev(info->hdev);
 
 	wait_event_timeout(hci_wait_queue,
 			(RESET_UNREGISTERED == info->reset_state),
@@ -1059,9 +1053,7 @@ static int remove_common(struct platform_device *pdev,
 
 	BT_INFO("Unregistering CG2900");
 	info->hdev->driver_data = NULL;
-	err = hci_unregister_dev(info->hdev);
-	if (err)
-		BT_ERR("Can not unregister HCI device (%d)", err);
+	hci_unregister_dev(info->hdev);
 	hci_free_dev(info->hdev);
 	info->hdev = NULL;
 
diff --git a/drivers/staging/cg2900/bluetooth/hci_ldisc.c b/drivers/staging/cg2900/bluetooth/hci_ldisc.c
index bb480317f6d..0ceb5e74255 100644
--- a/drivers/staging/cg2900/bluetooth/hci_ldisc.c
+++ b/drivers/staging/cg2900/bluetooth/hci_ldisc.c
@@ -41,7 +41,7 @@
 #define TTY_BREAK_ON		(-1)
 #define TTY_BREAK_OFF		(0)
 
-static int reset;
+static bool reset;
 
 static struct hci_uart_proto *hup[HCI_UART_MAX_PROTO];
 
diff --git a/drivers/staging/cg2900/board-ux500-cg2900.c b/drivers/staging/cg2900/board-ux500-cg2900.c
index 1f4b93ca0e5..cd25ff0a277 100644
--- a/drivers/staging/cg2900/board-ux500-cg2900.c
+++ b/drivers/staging/cg2900/board-ux500-cg2900.c
@@ -14,7 +14,7 @@
 #include <linux/gpio.h>
 #include <linux/gpio/nomadik.h>
 #include <linux/ioport.h>
-#include <linux/mfd/ab8500/gpio.h>
+#include <linux/mfd/abx500/ab8500-gpio.h>
 #include <linux/platform_device.h>
 #include <mach/gpio.h>
 #include <mach/id.h>
diff --git a/drivers/staging/cg2900/devices-cg2900.c b/drivers/staging/cg2900/devices-cg2900.c
index a2bd2c92f9c..e6703c96aa9 100644
--- a/drivers/staging/cg2900/devices-cg2900.c
+++ b/drivers/staging/cg2900/devices-cg2900.c
@@ -29,7 +29,6 @@
 #include <linux/skbuff.h>
 #include <linux/string.h>
 #include <linux/types.h>
-#include <linux/mfd/ab8500.h>
 #include <linux/regulator/consumer.h>
 #include <mach/id.h>
 #include <plat/pincfg.h>
-- 
cgit v1.2.3