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

Commit 7e244776 authored by Ying Xue's avatar Ying Xue Committed by Paul Gortmaker
Browse files

tipc: Remove callback field from subscription structure 



Eliminate the "event_cb" member from TIPC's "subscription" structure
since the function pointer it holds always points to subscr_send_event().

Signed-off-by: default avatarYing Xue <ying.xue@windriver.com>
Signed-off-by: default avatarAllan Stephens <allan.stephens@windriver.com>
Signed-off-by: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
parent 245f3d34

net/tipc/subscr.c

+1 −2
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ void tipc_subscr_report_overlap(struct subscription *sub, 
	if (!must && !(sub->filter & TIPC_SUB_PORTS))

		return;



	sub->event_cb(sub, found_lower, found_upper, event, port_ref, node);

	subscr_send_event(sub, found_lower, found_upper, event, port_ref, node);

}



/**
@@ -365,7 +365,6 @@ static struct subscription *subscr_subscribe(struct tipc_subscr *s, 
		subscr_terminate(subscriber);

		return NULL;

	}

	sub->event_cb = subscr_send_event;

	INIT_LIST_HEAD(&sub->nameseq_list);

	list_add(&sub->subscription_list, &subscriber->subscription_list);

	sub->server_ref = subscriber->port_ref;

net/tipc/subscr.h

+0 −6
Original line number Diff line number Diff line
@@ -39,16 +39,11 @@ 


struct subscription;



typedef void (*tipc_subscr_event) (struct subscription *sub,

				   u32 found_lower, u32 found_upper,

				   u32 event, u32 port_ref, u32 node);



/**

 * struct subscription - TIPC network topology subscription object

 * @seq: name sequence associated with subscription

 * @timeout: duration of subscription (in ms)

 * @filter: event filtering to be done for subscription

 * @event_cb: routine invoked when a subscription event is detected

 * @timer: timer governing subscription duration (optional)

 * @nameseq_list: adjacent subscriptions in name sequence's subscription list

 * @subscription_list: adjacent subscriptions in subscriber's subscription list
@@ -61,7 +56,6 @@ struct subscription { 
	struct tipc_name_seq seq;

	u32 timeout;

	u32 filter;

	tipc_subscr_event event_cb;

	struct timer_list timer;

	struct list_head nameseq_list;

	struct list_head subscription_list;