diff options
| author | Igor Russkikh <igor.russkikh@aquantia.com> | 2018-01-19 17:03:21 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-01-22 02:19:03 +0300 |
| commit | 23ee07ad3c2fd5adf6e9ef21afb9aec489dc3b4e (patch) | |
| tree | 9eb2eaa26a5cf47931e7580e3e01b0d9976fd7fd /drivers/net/ethernet/aquantia/atlantic/aq_nic.h | |
| parent | 8fcb98f462e6504e6d1ab2dab87c6db803c206b6 (diff) | |
| download | linux-23ee07ad3c2fd5adf6e9ef21afb9aec489dc3b4e.tar.xz | |
net: aquantia: Cleanup pci functions module
Driver contained a dead code of maintaining multiple pci port instances.
That will never be used since for each pci function a separate NIC
instance is created.
Simplify this, making pci module only responsible for pci resource
management.
NIC initialization is also simplified accordingly.
Signed-off-by: Igor Russkikh <igor.russkikh@aquantia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/aquantia/atlantic/aq_nic.h')
| -rw-r--r-- | drivers/net/ethernet/aquantia/atlantic/aq_nic.h | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_nic.h b/drivers/net/ethernet/aquantia/atlantic/aq_nic.h index 8e6e54213c36..a85b08a34ed4 100644 --- a/drivers/net/ethernet/aquantia/atlantic/aq_nic.h +++ b/drivers/net/ethernet/aquantia/atlantic/aq_nic.h @@ -17,7 +17,6 @@ #include "aq_hw.h" struct aq_ring_s; -struct aq_pci_func_s; struct aq_hw_ops; struct aq_fw_s; struct aq_vec_s; @@ -64,7 +63,6 @@ struct aq_nic_s { struct aq_ring_s *aq_ring_tx[AQ_CFG_VECS_MAX * AQ_CFG_TCS_MAX]; struct aq_hw_s *aq_hw; struct net_device *ndev; - struct aq_pci_func_s *aq_pci_func; unsigned int aq_vecs; unsigned int packet_filter; unsigned int power_state; @@ -88,19 +86,13 @@ static inline struct device *aq_nic_get_dev(struct aq_nic_s *self) return self->ndev->dev.parent; } -struct aq_nic_s *aq_nic_alloc_cold(struct pci_dev *pdev, - struct aq_pci_func_s *aq_pci_func, - unsigned int port, - const struct aq_hw_ops *aq_hw_ops, - const struct aq_hw_caps_s *aq_hw_caps); -int aq_nic_ndev_init(struct aq_nic_s *self); +void aq_nic_ndev_init(struct aq_nic_s *self); struct aq_nic_s *aq_nic_alloc_hot(struct net_device *ndev); void aq_nic_set_tx_ring(struct aq_nic_s *self, unsigned int idx, struct aq_ring_s *ring); -struct device *aq_nic_get_dev(struct aq_nic_s *self); struct net_device *aq_nic_get_ndev(struct aq_nic_s *self); int aq_nic_init(struct aq_nic_s *self); -int aq_nic_cfg_start(struct aq_nic_s *self); +void aq_nic_cfg_start(struct aq_nic_s *self); int aq_nic_ndev_register(struct aq_nic_s *self); void aq_nic_ndev_free(struct aq_nic_s *self); int aq_nic_start(struct aq_nic_s *self); @@ -111,6 +103,7 @@ void aq_nic_get_stats(struct aq_nic_s *self, u64 *data); int aq_nic_stop(struct aq_nic_s *self); void aq_nic_deinit(struct aq_nic_s *self); void aq_nic_free_hot_resources(struct aq_nic_s *self); +void aq_nic_free_vectors(struct aq_nic_s *self); int aq_nic_set_mtu(struct aq_nic_s *self, int new_mtu); int aq_nic_set_mac(struct aq_nic_s *self, struct net_device *ndev); int aq_nic_set_packet_filter(struct aq_nic_s *self, unsigned int flags); |