From: Li Zefan Date: Fri, 4 Jan 2008 09:59:42 +0000 (-0800) Subject: [CONNECTOR]: Cleanup struct cn_callback_entry X-Git-Tag: v2.6.25-rc1~1162^2~871 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6e32814bc89e7103e2b75b841155faf51f60a8f1;p=linux-2.6 [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: Li Zefan Signed-off-by: David S. Miller --- diff --git a/drivers/connector/cn_queue.c b/drivers/connector/cn_queue.c index dbda08c7b3..5732ca3259 100644 --- a/drivers/connector/cn_queue.c +++ b/drivers/connector/cn_queue.c @@ -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; diff --git a/include/linux/connector.h b/include/linux/connector.h index 7e18311d65..da6dd957f9 100644 --- a/include/linux/connector.h +++ b/include/linux/connector.h @@ -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 {