diff options
author | Sjur Brændeland <sjur.brandeland@stericsson.com> | 2012-06-25 03:49:43 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-06-25 19:44:12 -0400 |
commit | 91fa0cbc0c47930f771bf5425109956cc99c6b0b (patch) | |
tree | e589a855ed21121fff40ef89e8109d7b8cea760e /include/net/caif | |
parent | 1c385f1fdf6f9c66d982802cd74349c040980b50 (diff) |
caif-hsi: Remove use of module parameters
Remove use of module parameters on caif hsi device, as
rtnl configuration parameters are already supported.
All caif hsi configuration data is put in cfhsi_config,
and default values in hsi_default_config.
Signed-off-by: Sjur Brændeland <sjur.brandeland@stericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/caif')
-rw-r--r-- | include/net/caif/caif_hsi.h | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/include/net/caif/caif_hsi.h b/include/net/caif/caif_hsi.h index 6dc7dc2674b2..bcb9cc3ce98b 100644 --- a/include/net/caif/caif_hsi.h +++ b/include/net/caif/caif_hsi.h | |||
@@ -132,6 +132,15 @@ enum { | |||
132 | CFHSI_PRIO_LAST, | 132 | CFHSI_PRIO_LAST, |
133 | }; | 133 | }; |
134 | 134 | ||
135 | struct cfhsi_config { | ||
136 | u32 inactivity_timeout; | ||
137 | u32 aggregation_timeout; | ||
138 | u32 head_align; | ||
139 | u32 tail_align; | ||
140 | u32 q_high_mark; | ||
141 | u32 q_low_mark; | ||
142 | }; | ||
143 | |||
135 | /* Structure implemented by CAIF HSI drivers. */ | 144 | /* Structure implemented by CAIF HSI drivers. */ |
136 | struct cfhsi { | 145 | struct cfhsi { |
137 | struct caif_dev_common cfdev; | 146 | struct caif_dev_common cfdev; |
@@ -142,7 +151,7 @@ struct cfhsi { | |||
142 | struct cfhsi_ops *ops; | 151 | struct cfhsi_ops *ops; |
143 | int tx_state; | 152 | int tx_state; |
144 | struct cfhsi_rx_state rx_state; | 153 | struct cfhsi_rx_state rx_state; |
145 | unsigned long inactivity_timeout; | 154 | struct cfhsi_config cfg; |
146 | int rx_len; | 155 | int rx_len; |
147 | u8 *rx_ptr; | 156 | u8 *rx_ptr; |
148 | u8 *tx_buf; | 157 | u8 *tx_buf; |
@@ -150,8 +159,6 @@ struct cfhsi { | |||
150 | u8 *rx_flip_buf; | 159 | u8 *rx_flip_buf; |
151 | spinlock_t lock; | 160 | spinlock_t lock; |
152 | int flow_off_sent; | 161 | int flow_off_sent; |
153 | u32 q_low_mark; | ||
154 | u32 q_high_mark; | ||
155 | struct list_head list; | 162 | struct list_head list; |
156 | struct work_struct wake_up_work; | 163 | struct work_struct wake_up_work; |
157 | struct work_struct wake_down_work; | 164 | struct work_struct wake_down_work; |
@@ -164,7 +171,6 @@ struct cfhsi { | |||
164 | struct timer_list rx_slowpath_timer; | 171 | struct timer_list rx_slowpath_timer; |
165 | 172 | ||
166 | /* TX aggregation */ | 173 | /* TX aggregation */ |
167 | unsigned long aggregation_timeout; | ||
168 | int aggregation_len; | 174 | int aggregation_len; |
169 | struct timer_list aggregation_timer; | 175 | struct timer_list aggregation_timer; |
170 | 176 | ||