diff options
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-trans.h')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-trans.h | 25 |
1 files changed, 4 insertions, 21 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans.h b/drivers/net/wireless/iwlwifi/iwl-trans.h index 8d91422c5982..dd57a36ecb10 100644 --- a/drivers/net/wireless/iwlwifi/iwl-trans.h +++ b/drivers/net/wireless/iwlwifi/iwl-trans.h | |||
@@ -180,7 +180,7 @@ struct iwl_rx_packet { | |||
180 | * enum CMD_MODE - how to send the host commands ? | 180 | * enum CMD_MODE - how to send the host commands ? |
181 | * | 181 | * |
182 | * @CMD_SYNC: The caller will be stalled until the fw responds to the command | 182 | * @CMD_SYNC: The caller will be stalled until the fw responds to the command |
183 | * @CMD_ASYNC: Return right away and don't want for the response | 183 | * @CMD_ASYNC: Return right away and don't wait for the response |
184 | * @CMD_WANT_SKB: valid only with CMD_SYNC. The caller needs the buffer of the | 184 | * @CMD_WANT_SKB: valid only with CMD_SYNC. The caller needs the buffer of the |
185 | * response. The caller needs to call iwl_free_resp when done. | 185 | * response. The caller needs to call iwl_free_resp when done. |
186 | */ | 186 | */ |
@@ -218,7 +218,7 @@ struct iwl_device_cmd { | |||
218 | * | 218 | * |
219 | * @IWL_HCMD_DFL_NOCOPY: By default, the command is copied to the host command's | 219 | * @IWL_HCMD_DFL_NOCOPY: By default, the command is copied to the host command's |
220 | * ring. The transport layer doesn't map the command's buffer to DMA, but | 220 | * ring. The transport layer doesn't map the command's buffer to DMA, but |
221 | * rather copies it to an previously allocated DMA buffer. This flag tells | 221 | * rather copies it to a previously allocated DMA buffer. This flag tells |
222 | * the transport layer not to copy the command, but to map the existing | 222 | * the transport layer not to copy the command, but to map the existing |
223 | * buffer (that is passed in) instead. This saves the memcpy and allows | 223 | * buffer (that is passed in) instead. This saves the memcpy and allows |
224 | * commands that are bigger than the fixed buffer to be submitted. | 224 | * commands that are bigger than the fixed buffer to be submitted. |
@@ -243,7 +243,7 @@ enum iwl_hcmd_dataflag { | |||
243 | * @handler_status: return value of the handler of the command | 243 | * @handler_status: return value of the handler of the command |
244 | * (put in setup_rx_handlers) - valid for SYNC mode only | 244 | * (put in setup_rx_handlers) - valid for SYNC mode only |
245 | * @flags: can be CMD_* | 245 | * @flags: can be CMD_* |
246 | * @len: array of the lenths of the chunks in data | 246 | * @len: array of the lengths of the chunks in data |
247 | * @dataflags: IWL_HCMD_DFL_* | 247 | * @dataflags: IWL_HCMD_DFL_* |
248 | * @id: id of the host command | 248 | * @id: id of the host command |
249 | */ | 249 | */ |
@@ -396,8 +396,6 @@ struct iwl_trans; | |||
396 | * May sleep | 396 | * May sleep |
397 | * @dbgfs_register: add the dbgfs files under this directory. Files will be | 397 | * @dbgfs_register: add the dbgfs files under this directory. Files will be |
398 | * automatically deleted. | 398 | * automatically deleted. |
399 | * @suspend: stop the device unless WoWLAN is configured | ||
400 | * @resume: resume activity of the device | ||
401 | * @write8: write a u8 to a register at offset ofs from the BAR | 399 | * @write8: write a u8 to a register at offset ofs from the BAR |
402 | * @write32: write a u32 to a register at offset ofs from the BAR | 400 | * @write32: write a u32 to a register at offset ofs from the BAR |
403 | * @read32: read a u32 register at offset ofs from the BAR | 401 | * @read32: read a u32 register at offset ofs from the BAR |
@@ -443,10 +441,7 @@ struct iwl_trans_ops { | |||
443 | 441 | ||
444 | int (*dbgfs_register)(struct iwl_trans *trans, struct dentry* dir); | 442 | int (*dbgfs_register)(struct iwl_trans *trans, struct dentry* dir); |
445 | int (*wait_tx_queue_empty)(struct iwl_trans *trans); | 443 | int (*wait_tx_queue_empty)(struct iwl_trans *trans); |
446 | #ifdef CONFIG_PM_SLEEP | 444 | |
447 | int (*suspend)(struct iwl_trans *trans); | ||
448 | int (*resume)(struct iwl_trans *trans); | ||
449 | #endif | ||
450 | void (*write8)(struct iwl_trans *trans, u32 ofs, u8 val); | 445 | void (*write8)(struct iwl_trans *trans, u32 ofs, u8 val); |
451 | void (*write32)(struct iwl_trans *trans, u32 ofs, u32 val); | 446 | void (*write32)(struct iwl_trans *trans, u32 ofs, u32 val); |
452 | u32 (*read32)(struct iwl_trans *trans, u32 ofs); | 447 | u32 (*read32)(struct iwl_trans *trans, u32 ofs); |
@@ -700,18 +695,6 @@ static inline int iwl_trans_dbgfs_register(struct iwl_trans *trans, | |||
700 | return trans->ops->dbgfs_register(trans, dir); | 695 | return trans->ops->dbgfs_register(trans, dir); |
701 | } | 696 | } |
702 | 697 | ||
703 | #ifdef CONFIG_PM_SLEEP | ||
704 | static inline int iwl_trans_suspend(struct iwl_trans *trans) | ||
705 | { | ||
706 | return trans->ops->suspend(trans); | ||
707 | } | ||
708 | |||
709 | static inline int iwl_trans_resume(struct iwl_trans *trans) | ||
710 | { | ||
711 | return trans->ops->resume(trans); | ||
712 | } | ||
713 | #endif | ||
714 | |||
715 | static inline void iwl_trans_write8(struct iwl_trans *trans, u32 ofs, u8 val) | 698 | static inline void iwl_trans_write8(struct iwl_trans *trans, u32 ofs, u8 val) |
716 | { | 699 | { |
717 | trans->ops->write8(trans, ofs, val); | 700 | trans->ops->write8(trans, ofs, val); |