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

Commit 6e32814b authored by Li Zefan's avatar Li Zefan Committed by David S. Miller
Browse files

[CONNECTOR]: Cleanup struct cn_callback_entry 



- 'cb' is a fake struct member. In a previous patch struct cn_callback
was renamed to cn_callback_id, so 'cb' should have been deleted at that
time.

- 'nls' isn't used and is redundant, we can retrieve this data through
cn_callback_entry.pdev->nls.

- 'seq' and 'group' should be u32, as they are declared to be u32 in
other places.

Signed-off-by: default avatarLi Zefan <lizf@cn.fujitsu.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 96a89965

drivers/connector/cn_queue.c

+0 −1
Original line number Diff line number Diff line
@@ -104,7 +104,6 @@ int cn_queue_add_callback(struct cn_queue_dev *dev, char *name, struct cb_id *id 
		return -EINVAL;

	}



	cbq->nls = dev->nls;

	cbq->seq = 0;

	cbq->group = cbq->id.id.idx;

include/linux/connector.h

+1 −3
Original line number Diff line number Diff line
@@ -132,15 +132,13 @@ struct cn_callback_data { 


struct cn_callback_entry {

	struct list_head callback_entry;

	struct cn_callback *cb;

	struct work_struct work;

	struct cn_queue_dev *pdev;



	struct cn_callback_id id;

	struct cn_callback_data data;



	int seq, group;

	struct sock *nls;

	u32 seq, group;

};



struct cn_ctl_entry {