Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 296aa1ff authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "rmnet_ctl: remove symbol_get and put usage"

parents 1842e30e ce95afc3

core/dfc_qmap.c

+2 −7
Original line number Diff line number Diff line
@@ -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;

	}



	pr_info("DFC QMAP exit\n");

}

core/rmnet_ctl.h

+2 −0
Original line number Diff line number Diff line
@@ -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_ */

core/rmnet_ctl_client.c

+6 −1
Original line number Diff line number Diff line
@@ -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);