[5/5] qmimodem: Remove glib use from util.[ch]

Commit Message

Denis Kenzior March 4, 2024, 8:34 p.m. UTC

glib use is retained by sim and sim-legacy drivers since these drivers
utilize sim related utilities that have not yet been ported to ell.
Also, sim driver uses a single glib timeout source
---
 drivers/qmimodem/sim-legacy.c | 2 ++
 drivers/qmimodem/sim.c        | 2 ++
 drivers/qmimodem/util.h       | 3 +--
 3 files changed, 5 insertions(+), 2 deletions(-)

Patch

diff --git a/drivers/qmimodem/sim-legacy.c b/drivers/qmimodem/sim-legacy.c
index e9ed0a9ec4c1..fd05f219ea52 100644
--- a/drivers/qmimodem/sim-legacy.c
+++ b/drivers/qmimodem/sim-legacy.c
@@ -30,6 +30,8 @@ 
 #include <ofono/modem.h>
 #include <ofono/sim.h>
 
+#include <glib.h>
+
 #include "qmi.h"
 #include "dms.h"
 #include "util.h"
diff --git a/drivers/qmimodem/sim.c b/drivers/qmimodem/sim.c
index 110af6686627..8605e03c6f4f 100644
--- a/drivers/qmimodem/sim.c
+++ b/drivers/qmimodem/sim.c
@@ -29,6 +29,8 @@ 
 #include <ofono/modem.h>
 #include <ofono/sim.h>
 
+#include <glib.h>
+
 #include "qmi.h"
 #include "dms.h"
 #include "uim.h"
diff --git a/drivers/qmimodem/util.h b/drivers/qmimodem/util.h
index 68bc93837c71..8c0c3c3c76ce 100644
--- a/drivers/qmimodem/util.h
+++ b/drivers/qmimodem/util.h
@@ -19,7 +19,6 @@ 
  *
  */
 
-#include <glib.h>
 #include <ell/ell.h>
 
 struct cb_data {
@@ -48,7 +47,7 @@  static inline struct cb_data *cb_data_ref(struct cb_data *cbd)
 	return cbd;
 }
 
-static inline void cb_data_unref(gpointer user_data)
+static inline void cb_data_unref(void *user_data)
 {
 	struct cb_data *cbd = user_data;