ste_conn: Partly fixed build issues with 2.6.33

Signed-off-by: Jonas Aaberg <jonas.aberg@stericsson.com>

3 files changed, 11 insertions, 7 deletions

diff --git a/drivers/mfd/ste_conn/ste_conn_ccd.c b/drivers/mfd/ste_conn/ste_conn_ccd.c
index 63a0b759984..77b7c56330d 100755
--- a/drivers/mfd/ste_conn/ste_conn_ccd.c
+++ b/drivers/mfd/ste_conn/ste_conn_ccd.c
@@ -28,6 +28,7 @@
 #include <linux/timer.h>
 #include <linux/miscdevice.h>
 #include <linux/mutex.h>
+#include <linux/sched.h>
 
 #include <linux/mfd/ste_conn.h>
 #include "ste_conn_cpd.h"
@@ -1004,9 +1005,11 @@ static int uart_tty_open(struct tty_struct *tty)
 	/* Flush any pending characters in the driver and line discipline.
 	* Don't use ldisc_ref here as the open path is before the ldisc is referencable
 	*/
-	if (tty->ldisc.ops->flush_buffer) {
-		tty->ldisc.ops->flush_buffer(tty);
+
+	if (tty->ldisc->ops->flush_buffer) {
+		tty->ldisc->ops->flush_buffer(tty);
 	}
+
 	tty_driver_flush_buffer(tty);
 
 	ccd_info->dev->parent = NULL;
@@ -1960,8 +1963,8 @@ static void __exit ste_conn_exit(void)
 	test_char_device_destroy();
 	if (ccd_info) {
 		temp_devt = ccd_info->dev->devt;
-		kfree(ccd_info->dev->driver_data);
 		device_destroy(ccd_info->ccd_class, temp_devt);
+		kfree(dev_get_drvdata(ccd_info->dev));
 		class_destroy(ccd_info->ccd_class);
 		unregister_chrdev_region(temp_devt, 32);
 
diff --git a/drivers/mfd/ste_conn/ste_conn_char_devices.c b/drivers/mfd/ste_conn/ste_conn_char_devices.c
index 65c2173b451..163193de3f2 100755
--- a/drivers/mfd/ste_conn/ste_conn_char_devices.c
+++ b/drivers/mfd/ste_conn/ste_conn_char_devices.c
@@ -23,6 +23,7 @@
 #include <linux/device.h>
 #include <linux/poll.h>
 #include <linux/mutex.h>
+#include <linux/sched.h>
 
 #include <linux/mfd/ste_conn.h>
 #include <mach/ste_conn_devices.h>
@@ -581,7 +582,7 @@ static int char_dev_setup_cdev(struct ste_conn_char_dev_user *dev_usr,
 {
 	int err = 0;
 	struct ste_conn_ccd_driver_data *driver_data =
-		(struct ste_conn_ccd_driver_data *)parent->driver_data;
+		(struct ste_conn_ccd_driver_data *)dev_get_drvdata(parent);
 
 	if (!driver_data) {
 		STE_CONN_ERR("Received driver data is empty");
diff --git a/drivers/mfd/ste_conn/ste_conn_hci_driver.c b/drivers/mfd/ste_conn/ste_conn_hci_driver.c
index a336dd49950..5d429ed8e9f 100755
--- a/drivers/mfd/ste_conn/ste_conn_hci_driver.c
+++ b/drivers/mfd/ste_conn/ste_conn_hci_driver.c
@@ -160,7 +160,7 @@ struct ste_conn_hci_info {
 	enum ste_conn_hci_reset_state		hreset_state;
 	enum ste_conn_hci_enable_state		enable_state;
 	struct rfkill				*rfkill;
-	enum rfkill_state			rfkill_state;
+	int					rfkill_state;
 	enum ste_conn_hci_rfkill_rf_state	rfkill_rf_state;
 };
 
@@ -215,8 +215,8 @@ static void ste_conn_hci_cpd_reset_cb(struct ste_conn_device *dev);
 /* RFKill handling functions */
 static int ste_conn_hci_rfkill_register(void);
 static void ste_conn_hci_rfkill_deregister(void);
-static int ste_conn_hci_rfkill_toggle_radio(void *data, enum rfkill_state state);
-static int ste_conn_hci_rfkill_get_state(void *data, enum rfkill_state *state);
+static int ste_conn_hci_rfkill_toggle_radio(void *data, int state);
+static int ste_conn_hci_rfkill_get_state(void *data, int *state);
 
 /*
   * struct ste_conn_hci_cb - Specifies callback structure for ste_conn user.