From 0b23b2b74b83ddce172ce96dcd72041de25d35ff Mon Sep 17 00:00:00 2001
From: Denis Kenzior <denkenz@gmail.com>
Date: Thu, 12 Nov 2015 13:16:53 -0600
Subject: rilmodem: Get rid of ril_voicecall_driver_data

---
 drivers/rilmodem/rilutil.h   |  5 -----
 drivers/rilmodem/voicecall.c | 25 ++++++-------------------
 drivers/rilmodem/voicecall.h |  4 ----
 3 files changed, 6 insertions(+), 28 deletions(-)

diff --git a/drivers/rilmodem/rilutil.h b/drivers/rilmodem/rilutil.h
index 3c918d34..8cd68a62 100644
--- a/drivers/rilmodem/rilutil.h
+++ b/drivers/rilmodem/rilutil.h
@@ -79,11 +79,6 @@ struct ril_gprs_context_data {
 	enum ofono_gprs_context_type type;
 };
 
-struct ril_voicecall_driver_data {
-	GRil *gril;
-	struct ofono_modem *modem;
-};
-
 struct ril_gprs_driver_data {
 	GRil *gril;
 	struct ofono_modem *modem;
diff --git a/drivers/rilmodem/voicecall.c b/drivers/rilmodem/voicecall.c
index 3530972b..65684df9 100644
--- a/drivers/rilmodem/voicecall.c
+++ b/drivers/rilmodem/voicecall.c
@@ -692,13 +692,13 @@ static gboolean ril_delayed_register(gpointer user_data)
 	return FALSE;
 }
 
-void ril_voicecall_start(struct ril_voicecall_driver_data *driver_data,
-				struct ofono_voicecall *vc,
-				unsigned int vendor,
-				struct ril_voicecall_data *vd)
+int ril_voicecall_probe(struct ofono_voicecall *vc, unsigned int vendor,
+			void *data)
 {
-	vd->ril = g_ril_clone(driver_data->gril);
-	vd->modem = driver_data->modem;
+	GRil *ril = data;
+	struct ril_voicecall_data *vd = g_new0(struct ril_voicecall_data, 1);
+
+	vd->ril = g_ril_clone(ril);
 	vd->vendor = vendor;
 	vd->cb = NULL;
 	vd->data = NULL;
@@ -708,19 +708,6 @@ void ril_voicecall_start(struct ril_voicecall_driver_data *driver_data,
 	ofono_voicecall_set_data(vc, vd);
 
 	g_idle_add(ril_delayed_register, vc);
-}
-
-int ril_voicecall_probe(struct ofono_voicecall *vc, unsigned int vendor,
-			void *data)
-{
-	struct ril_voicecall_driver_data *driver_data = data;
-	struct ril_voicecall_data *vd;
-
-	vd = g_try_new0(struct ril_voicecall_data, 1);
-	if (vd == NULL)
-		return -ENOMEM;
-
-	ril_voicecall_start(driver_data, vc, vendor, vd);
 
 	return 0;
 }
diff --git a/drivers/rilmodem/voicecall.h b/drivers/rilmodem/voicecall.h
index ff952f7e..31e120e3 100644
--- a/drivers/rilmodem/voicecall.h
+++ b/drivers/rilmodem/voicecall.h
@@ -62,9 +62,5 @@ void ril_set_udub(struct ofono_voicecall *vc,
 void ril_release_all_active(struct ofono_voicecall *vc,
 				ofono_voicecall_cb_t cb, void *data);
 
-void ril_voicecall_start(struct ril_voicecall_driver_data *driver_data,
-				struct ofono_voicecall *vc,
-				unsigned int vendor,
-				struct ril_voicecall_data *vd);
 void ril_call_state_notify(struct ril_msg *message, gpointer user_data);
 gboolean ril_poll_clcc(gpointer user_data);
-- 
cgit v1.2.3