diff options
author | Li Zefan <lizf@cn.fujitsu.com> | 2008-01-04 04:59:42 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-01-28 18:00:40 -0500 |
commit | 6e32814bc89e7103e2b75b841155faf51f60a8f1 (patch) | |
tree | 8671823df2eb91152f7abd03467e6a2432da0468 /include/linux/connector.h | |
parent | 96a899655e2c3ba53f083eda69706ee4eb05271f (diff) |
[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>
Diffstat (limited to 'include/linux/connector.h')
-rw-r--r-- | include/linux/connector.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/include/linux/connector.h b/include/linux/connector.h index 7e18311d655e..da6dd957f908 100644 --- a/include/linux/connector.h +++ b/include/linux/connector.h | |||
@@ -132,15 +132,13 @@ struct cn_callback_data { | |||
132 | 132 | ||
133 | struct cn_callback_entry { | 133 | struct cn_callback_entry { |
134 | struct list_head callback_entry; | 134 | struct list_head callback_entry; |
135 | struct cn_callback *cb; | ||
136 | struct work_struct work; | 135 | struct work_struct work; |
137 | struct cn_queue_dev *pdev; | 136 | struct cn_queue_dev *pdev; |
138 | 137 | ||
139 | struct cn_callback_id id; | 138 | struct cn_callback_id id; |
140 | struct cn_callback_data data; | 139 | struct cn_callback_data data; |
141 | 140 | ||
142 | int seq, group; | 141 | u32 seq, group; |
143 | struct sock *nls; | ||
144 | }; | 142 | }; |
145 | 143 | ||
146 | struct cn_ctl_entry { | 144 | struct cn_ctl_entry { |