summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLi Zefan <lizf@cn.fujitsu.com>2008-01-04 01:59:42 -0800
committerDavid S. Miller <davem@davemloft.net>2008-01-28 15:00:40 -0800
commit6e32814bc89e7103e2b75b841155faf51f60a8f1 (patch)
tree8671823df2eb91152f7abd03467e6a2432da0468
parent96a899655e2c3ba53f083eda69706ee4eb05271f (diff)
downloadlinux-3.10-6e32814bc89e7103e2b75b841155faf51f60a8f1.tar.gz
linux-3.10-6e32814bc89e7103e2b75b841155faf51f60a8f1.tar.bz2
linux-3.10-6e32814bc89e7103e2b75b841155faf51f60a8f1.zip
[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 <lizf@cn.fujitsu.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/connector/cn_queue.c1
-rw-r--r--include/linux/connector.h4
2 files changed, 1 insertions, 4 deletions
diff --git a/drivers/connector/cn_queue.c b/drivers/connector/cn_queue.c
index dbda08c7b3d..5732ca3259f 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 7e18311d655..da6dd957f90 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 {