Bladeren bron

rmnet_ctl: remove symbol_get and put usage

Removes symbol_get() and symbol_put() usage.

Change-Id: Ic4142635af717797ed43c3b4925e152c73c95581
Acked-by: Weiyi Chen <[email protected]>
Signed-off-by: Subash Abhinov Kasiviswanathan <[email protected]>
Subash Abhinov Kasiviswanathan 5 jaren geleden
bovenliggende
commit
ce95afc361
3 gewijzigde bestanden met toevoegingen van 10 en 8 verwijderingen
  1. 2 7
      core/dfc_qmap.c
  2. 2 0
      core/rmnet_ctl.h
  3. 6 1
      core/rmnet_ctl_client.c

+ 2 - 7
core/dfc_qmap.c

@@ -128,7 +128,6 @@ static struct dfc_qmi_data __rcu *qmap_dfc_data;
 static atomic_t qmap_txid;
 static void *rmnet_ctl_handle;
 
-extern struct rmnet_ctl_client_if rmnet_ctl_if;
 static struct rmnet_ctl_client_if *rmnet_ctl;
 
 static void dfc_qmap_send_end_marker_cnf(struct qos_info *qos,
@@ -504,7 +503,7 @@ int dfc_qmap_client_init(void *port, int index, struct svc_info *psvc,
 
 	atomic_set(&qmap_txid, 0);
 
-	rmnet_ctl = symbol_get(rmnet_ctl_if);
+	rmnet_ctl = rmnet_ctl_if();
 	if (!rmnet_ctl) {
 		pr_err("rmnet_ctl module not loaded\n");
 		goto out;
@@ -547,11 +546,7 @@ void dfc_qmap_client_exit(void *dfc_data)
 	synchronize_rcu();
 
 	kfree(data);
-
-	if (rmnet_ctl) {
-		symbol_put(rmnet_ctl_if);
-		rmnet_ctl = NULL;
-	}
+	rmnet_ctl = NULL;
 
 	pr_info("DFC QMAP exit\n");
 }

+ 2 - 0
core/rmnet_ctl.h

@@ -29,4 +29,6 @@ struct rmnet_ctl_client_if {
 		       const void *data, unsigned int len);
 };
 
+struct rmnet_ctl_client_if *rmnet_ctl_if(void);
+
 #endif /* _RMNET_CTL_H_ */

+ 6 - 1
core/rmnet_ctl_client.c

@@ -205,10 +205,15 @@ void rmnet_ctl_log(enum rmnet_ctl_log_lvl lvl, const char *msg,
 }
 EXPORT_SYMBOL(rmnet_ctl_log);
 
-struct rmnet_ctl_client_if rmnet_ctl_if = {
+static struct rmnet_ctl_client_if client_if = {
 	.reg = rmnet_ctl_register_client,
 	.dereg = rmnet_ctl_unregister_client,
 	.send = rmnet_ctl_send_client,
 	.log = rmnet_ctl_log,
 };
+
+struct rmnet_ctl_client_if *rmnet_ctl_if(void)
+{
+	return &client_if;
+}
 EXPORT_SYMBOL(rmnet_ctl_if);