diff options
| author | Sjur Brændeland <sjur.brandeland@stericsson.com> | 2012-06-25 09:49:43 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-06-26 01:44:12 +0200 |
| commit | 91fa0cbc0c47930f771bf5425109956cc99c6b0b (patch) | |
| tree | e589a855ed21121fff40ef89e8109d7b8cea760e /include/net/caif/caif_hsi.h | |
| parent | caif-hsi: Replace platform device with ops structure. (diff) | |
| download | linux-91fa0cbc0c47930f771bf5425109956cc99c6b0b.tar.xz linux-91fa0cbc0c47930f771bf5425109956cc99c6b0b.zip | |
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/caif_hsi.h')
| -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 { CFHSI_PRIO_LAST, }; +struct cfhsi_config { + u32 inactivity_timeout; + u32 aggregation_timeout; + u32 head_align; + u32 tail_align; + u32 q_high_mark; + u32 q_low_mark; +}; + /* Structure implemented by CAIF HSI drivers. */ struct cfhsi { struct caif_dev_common cfdev; @@ -142,7 +151,7 @@ struct cfhsi { struct cfhsi_ops *ops; int tx_state; struct cfhsi_rx_state rx_state; - unsigned long inactivity_timeout; + struct cfhsi_config cfg; int rx_len; u8 *rx_ptr; u8 *tx_buf; @@ -150,8 +159,6 @@ struct cfhsi { u8 *rx_flip_buf; spinlock_t lock; int flow_off_sent; - u32 q_low_mark; - u32 q_high_mark; struct list_head list; struct work_struct wake_up_work; struct work_struct wake_down_work; @@ -164,7 +171,6 @@ struct cfhsi { struct timer_list rx_slowpath_timer; /* TX aggregation */ - unsigned long aggregation_timeout; int aggregation_len; struct timer_list aggregation_timer; |