diff options
author | Sathya Perla <sathyap@serverengines.com> | 2009-07-27 18:52:23 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-08-02 02:06:26 -0400 |
commit | eec368fb3ce3ee9e7bb042bbafb03f297d96e55e (patch) | |
tree | 1aa525ff817ea1cbcc6c95bc5beb1d01d38b1e26 /drivers/net/benet/be.h | |
parent | 8788fdc2a53cf012a43808877eaa6ac7e3c923b4 (diff) |
be2net: remove pci_func field from be_adapter struct
pci function is available as PCI_FUNC(pdev->devfn); no need for a
separate field.
Signed-off-by: Sathya Perla <sathyap@serverengines.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/benet/be.h')
-rw-r--r-- | drivers/net/benet/be.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/net/benet/be.h b/drivers/net/benet/be.h index d8a157f8caf4..beb131399231 100644 --- a/drivers/net/benet/be.h +++ b/drivers/net/benet/be.h | |||
@@ -213,7 +213,6 @@ struct be_adapter { | |||
213 | u8 __iomem *csr; | 213 | u8 __iomem *csr; |
214 | u8 __iomem *db; /* Door Bell */ | 214 | u8 __iomem *db; /* Door Bell */ |
215 | u8 __iomem *pcicfg; /* PCI config space */ | 215 | u8 __iomem *pcicfg; /* PCI config space */ |
216 | int pci_func; | ||
217 | 216 | ||
218 | spinlock_t mbox_lock; /* For serializing mbox cmds to BE card */ | 217 | spinlock_t mbox_lock; /* For serializing mbox cmds to BE card */ |
219 | struct be_dma_mem mbox_mem; | 218 | struct be_dma_mem mbox_mem; |
@@ -264,6 +263,11 @@ extern struct ethtool_ops be_ethtool_ops; | |||
264 | 263 | ||
265 | #define drvr_stats(adapter) (&adapter->stats.drvr_stats) | 264 | #define drvr_stats(adapter) (&adapter->stats.drvr_stats) |
266 | 265 | ||
266 | static inline unsigned int be_pci_func(struct be_adapter *adapter) | ||
267 | { | ||
268 | return PCI_FUNC(adapter->pdev->devfn); | ||
269 | } | ||
270 | |||
267 | #define BE_SET_NETDEV_OPS(netdev, ops) (netdev->netdev_ops = ops) | 271 | #define BE_SET_NETDEV_OPS(netdev, ops) (netdev->netdev_ops = ops) |
268 | 272 | ||
269 | #define PAGE_SHIFT_4K 12 | 273 | #define PAGE_SHIFT_4K 12 |