Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 265846
b: refs/heads/master
c: 6fbfae8
h: refs/heads/master
v: v3
  • Loading branch information
Emmanuel Grumbach authored and John W. Linville committed Aug 29, 2011
1 parent 8685179 commit e605ba1
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e6bb4c9c00892c488f3218ea317dc6a71674faf4
refs/heads/master: 6fbfae8e65139061080c70c8c337f74c50e8fd55
15 changes: 12 additions & 3 deletions trunk/drivers/net/wireless/iwlwifi/iwl-bus.h
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,10 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*****************************************************************************/
#ifndef __iwl_pci_h__
#define __iwl_pci_h__
#ifndef __iwl_bus_h__
#define __iwl_bus_h__

/*This file includes the declaration that are exported from the bus layer */

struct iwl_shared;
struct iwl_bus;
Expand All @@ -86,6 +88,13 @@ struct iwl_bus_ops {
u32 (*read32)(struct iwl_bus *bus, u32 ofs);
};

/**
* struct iwl_bus - bus common data
* @dev - pointer to struct device * that represent the device
* @ops - pointer to iwl_bus_ops
* @shrd - pointer to iwl_shared which holds shared data from the upper layer
* @irq - the irq number for the device
*/
struct iwl_bus {
/* Common data to all buses */
struct device *dev;
Expand Down Expand Up @@ -138,4 +147,4 @@ static inline u32 bus_read32(struct iwl_bus *bus, u32 ofs)
int __must_check iwl_pci_register_driver(void);
void iwl_pci_unregister_driver(void);

#endif
#endif /* __iwl_bus_h__ */
5 changes: 5 additions & 0 deletions trunk/drivers/net/wireless/iwlwifi/iwl-trans.h
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,11 @@ struct iwl_trans_ops {
void (*free)(struct iwl_priv *priv);
};

/**
* struct iwl_trans - transport common data
* @ops - pointer to iwl_trans_ops
* @shrd - pointer to iwl_shared which holds shared data from the upper layer
*/
struct iwl_trans {
const struct iwl_trans_ops *ops;
struct iwl_shared *shrd;
Expand Down

0 comments on commit e605ba1

Please sign in to comment.