Commit 4cbc9f92 authored by Igor Russkikh's avatar Igor Russkikh Committed by David S. Miller

net: aquantia: Add const qualifiers for hardware ops tables

Hardware operations and capabilities tables are constants and
never changed. Declare these as constants.
Signed-off-by: default avatarIgor Russkikh <igor.russkikh@aquantia.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c40d2015
...@@ -196,7 +196,8 @@ struct aq_hw_ops { ...@@ -196,7 +196,8 @@ struct aq_hw_ops {
struct aq_rss_parameters *rss_params); struct aq_rss_parameters *rss_params);
int (*hw_get_regs)(struct aq_hw_s *self, int (*hw_get_regs)(struct aq_hw_s *self,
struct aq_hw_caps_s *aq_hw_caps, u32 *regs_buff); const struct aq_hw_caps_s *aq_hw_caps,
u32 *regs_buff);
int (*hw_update_stats)(struct aq_hw_s *self); int (*hw_update_stats)(struct aq_hw_s *self);
......
...@@ -35,9 +35,9 @@ MODULE_VERSION(AQ_CFG_DRV_VERSION); ...@@ -35,9 +35,9 @@ MODULE_VERSION(AQ_CFG_DRV_VERSION);
MODULE_AUTHOR(AQ_CFG_DRV_AUTHOR); MODULE_AUTHOR(AQ_CFG_DRV_AUTHOR);
MODULE_DESCRIPTION(AQ_CFG_DRV_DESC); MODULE_DESCRIPTION(AQ_CFG_DRV_DESC);
static struct aq_hw_ops *aq_pci_probe_get_hw_ops_by_id(struct pci_dev *pdev) static const struct aq_hw_ops *aq_pci_probe_get_hw_ops_by_id(struct pci_dev *pdev)
{ {
struct aq_hw_ops *ops = NULL; const struct aq_hw_ops *ops = NULL;
ops = hw_atl_a0_get_ops_by_id(pdev); ops = hw_atl_a0_get_ops_by_id(pdev);
if (!ops) if (!ops)
...@@ -174,7 +174,7 @@ static const struct net_device_ops aq_ndev_ops = { ...@@ -174,7 +174,7 @@ static const struct net_device_ops aq_ndev_ops = {
static int aq_pci_probe(struct pci_dev *pdev, static int aq_pci_probe(struct pci_dev *pdev,
const struct pci_device_id *pci_id) const struct pci_device_id *pci_id)
{ {
struct aq_hw_ops *aq_hw_ops = NULL; const struct aq_hw_ops *aq_hw_ops = NULL;
struct aq_pci_func_s *aq_pci_func = NULL; struct aq_pci_func_s *aq_pci_func = NULL;
int err = 0; int err = 0;
......
...@@ -295,7 +295,7 @@ int aq_nic_ndev_register(struct aq_nic_s *self) ...@@ -295,7 +295,7 @@ int aq_nic_ndev_register(struct aq_nic_s *self)
int aq_nic_ndev_init(struct aq_nic_s *self) int aq_nic_ndev_init(struct aq_nic_s *self)
{ {
struct aq_hw_caps_s *aq_hw_caps = self->aq_nic_cfg.aq_hw_caps; const struct aq_hw_caps_s *aq_hw_caps = self->aq_nic_cfg.aq_hw_caps;
struct aq_nic_cfg_s *aq_nic_cfg = &self->aq_nic_cfg; struct aq_nic_cfg_s *aq_nic_cfg = &self->aq_nic_cfg;
self->ndev->hw_features |= aq_hw_caps->hw_features; self->ndev->hw_features |= aq_hw_caps->hw_features;
......
...@@ -34,7 +34,7 @@ struct aq_hw_ops; ...@@ -34,7 +34,7 @@ struct aq_hw_ops;
#define AQ_NIC_RATE_100M BIT(5) #define AQ_NIC_RATE_100M BIT(5)
struct aq_nic_cfg_s { struct aq_nic_cfg_s {
struct aq_hw_caps_s *aq_hw_caps; const struct aq_hw_caps_s *aq_hw_caps;
u64 hw_features; u64 hw_features;
u32 rxds; /* rx ring size, descriptors # */ u32 rxds; /* rx ring size, descriptors # */
u32 txds; /* tx ring size, descriptors # */ u32 txds; /* tx ring size, descriptors # */
......
...@@ -29,7 +29,7 @@ struct aq_pci_func_s { ...@@ -29,7 +29,7 @@ struct aq_pci_func_s {
struct aq_hw_caps_s aq_hw_caps; struct aq_hw_caps_s aq_hw_caps;
}; };
struct aq_pci_func_s *aq_pci_func_alloc(struct aq_hw_ops *aq_hw_ops, struct aq_pci_func_s *aq_pci_func_alloc(const struct aq_hw_ops *aq_hw_ops,
struct pci_dev *pdev, struct pci_dev *pdev,
const struct net_device_ops *ndev_ops, const struct net_device_ops *ndev_ops,
const struct ethtool_ops *eth_ops) const struct ethtool_ops *eth_ops)
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
#include "aq_common.h" #include "aq_common.h"
#include "aq_nic.h" #include "aq_nic.h"
struct aq_pci_func_s *aq_pci_func_alloc(struct aq_hw_ops *hw_ops, struct aq_pci_func_s *aq_pci_func_alloc(const struct aq_hw_ops *hw_ops,
struct pci_dev *pdev, struct pci_dev *pdev,
const struct net_device_ops *ndev_ops, const struct net_device_ops *ndev_ops,
const struct ethtool_ops *eth_ops); const struct ethtool_ops *eth_ops);
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#include <linux/netdevice.h> #include <linux/netdevice.h>
struct aq_vec_s { struct aq_vec_s {
struct aq_hw_ops *aq_hw_ops; const struct aq_hw_ops *aq_hw_ops;
struct aq_hw_s *aq_hw; struct aq_hw_s *aq_hw;
struct aq_nic_s *aq_nic; struct aq_nic_s *aq_nic;
unsigned int tx_rings; unsigned int tx_rings;
...@@ -165,7 +165,7 @@ struct aq_vec_s *aq_vec_alloc(struct aq_nic_s *aq_nic, unsigned int idx, ...@@ -165,7 +165,7 @@ struct aq_vec_s *aq_vec_alloc(struct aq_nic_s *aq_nic, unsigned int idx,
return self; return self;
} }
int aq_vec_init(struct aq_vec_s *self, struct aq_hw_ops *aq_hw_ops, int aq_vec_init(struct aq_vec_s *self, const struct aq_hw_ops *aq_hw_ops,
struct aq_hw_s *aq_hw) struct aq_hw_s *aq_hw)
{ {
struct aq_ring_s *ring = NULL; struct aq_ring_s *ring = NULL;
......
...@@ -26,7 +26,7 @@ irqreturn_t aq_vec_isr(int irq, void *private); ...@@ -26,7 +26,7 @@ irqreturn_t aq_vec_isr(int irq, void *private);
irqreturn_t aq_vec_isr_legacy(int irq, void *private); irqreturn_t aq_vec_isr_legacy(int irq, void *private);
struct aq_vec_s *aq_vec_alloc(struct aq_nic_s *aq_nic, unsigned int idx, struct aq_vec_s *aq_vec_alloc(struct aq_nic_s *aq_nic, unsigned int idx,
struct aq_nic_cfg_s *aq_nic_cfg); struct aq_nic_cfg_s *aq_nic_cfg);
int aq_vec_init(struct aq_vec_s *self, struct aq_hw_ops *aq_hw_ops, int aq_vec_init(struct aq_vec_s *self, const struct aq_hw_ops *aq_hw_ops,
struct aq_hw_s *aq_hw); struct aq_hw_s *aq_hw);
void aq_vec_deinit(struct aq_vec_s *self); void aq_vec_deinit(struct aq_vec_s *self);
void aq_vec_free(struct aq_vec_s *self); void aq_vec_free(struct aq_vec_s *self);
......
...@@ -851,7 +851,7 @@ static int hw_atl_a0_hw_set_speed(struct aq_hw_s *self, u32 speed) ...@@ -851,7 +851,7 @@ static int hw_atl_a0_hw_set_speed(struct aq_hw_s *self, u32 speed)
return err; return err;
} }
static struct aq_hw_ops hw_atl_ops_ = { static const struct aq_hw_ops hw_atl_ops_ = {
.create = hw_atl_a0_create, .create = hw_atl_a0_create,
.destroy = hw_atl_a0_destroy, .destroy = hw_atl_a0_destroy,
.get_hw_caps = hw_atl_a0_get_hw_caps, .get_hw_caps = hw_atl_a0_get_hw_caps,
...@@ -894,7 +894,7 @@ static struct aq_hw_ops hw_atl_ops_ = { ...@@ -894,7 +894,7 @@ static struct aq_hw_ops hw_atl_ops_ = {
.hw_get_fw_version = hw_atl_utils_get_fw_version, .hw_get_fw_version = hw_atl_utils_get_fw_version,
}; };
struct aq_hw_ops *hw_atl_a0_get_ops_by_id(struct pci_dev *pdev) const struct aq_hw_ops *hw_atl_a0_get_ops_by_id(struct pci_dev *pdev)
{ {
bool is_vid_ok = (pdev->vendor == PCI_VENDOR_ID_AQUANTIA); bool is_vid_ok = (pdev->vendor == PCI_VENDOR_ID_AQUANTIA);
bool is_did_ok = ((pdev->device == HW_ATL_DEVICE_ID_0001) || bool is_did_ok = ((pdev->device == HW_ATL_DEVICE_ID_0001) ||
......
...@@ -29,6 +29,6 @@ ...@@ -29,6 +29,6 @@
#endif #endif
struct aq_hw_ops *hw_atl_a0_get_ops_by_id(struct pci_dev *pdev); const struct aq_hw_ops *hw_atl_a0_get_ops_by_id(struct pci_dev *pdev);
#endif /* HW_ATL_A0_H */ #endif /* HW_ATL_A0_H */
...@@ -928,7 +928,7 @@ static int hw_atl_b0_hw_set_speed(struct aq_hw_s *self, u32 speed) ...@@ -928,7 +928,7 @@ static int hw_atl_b0_hw_set_speed(struct aq_hw_s *self, u32 speed)
return err; return err;
} }
static struct aq_hw_ops hw_atl_ops_ = { static const struct aq_hw_ops hw_atl_ops_ = {
.create = hw_atl_b0_create, .create = hw_atl_b0_create,
.destroy = hw_atl_b0_destroy, .destroy = hw_atl_b0_destroy,
.get_hw_caps = hw_atl_b0_get_hw_caps, .get_hw_caps = hw_atl_b0_get_hw_caps,
...@@ -971,7 +971,7 @@ static struct aq_hw_ops hw_atl_ops_ = { ...@@ -971,7 +971,7 @@ static struct aq_hw_ops hw_atl_ops_ = {
.hw_get_fw_version = hw_atl_utils_get_fw_version, .hw_get_fw_version = hw_atl_utils_get_fw_version,
}; };
struct aq_hw_ops *hw_atl_b0_get_ops_by_id(struct pci_dev *pdev) const struct aq_hw_ops *hw_atl_b0_get_ops_by_id(struct pci_dev *pdev)
{ {
bool is_vid_ok = (pdev->vendor == PCI_VENDOR_ID_AQUANTIA); bool is_vid_ok = (pdev->vendor == PCI_VENDOR_ID_AQUANTIA);
bool is_did_ok = ((pdev->device == HW_ATL_DEVICE_ID_0001) || bool is_did_ok = ((pdev->device == HW_ATL_DEVICE_ID_0001) ||
......
...@@ -29,6 +29,6 @@ ...@@ -29,6 +29,6 @@
#endif #endif
struct aq_hw_ops *hw_atl_b0_get_ops_by_id(struct pci_dev *pdev); const struct aq_hw_ops *hw_atl_b0_get_ops_by_id(struct pci_dev *pdev);
#endif /* HW_ATL_B0_H */ #endif /* HW_ATL_B0_H */
...@@ -117,7 +117,7 @@ static int hw_atl_utils_ver_match(u32 ver_expected, u32 ver_actual) ...@@ -117,7 +117,7 @@ static int hw_atl_utils_ver_match(u32 ver_expected, u32 ver_actual)
} }
static int hw_atl_utils_init_ucp(struct aq_hw_s *self, static int hw_atl_utils_init_ucp(struct aq_hw_s *self,
struct aq_hw_caps_s *aq_hw_caps) const struct aq_hw_caps_s *aq_hw_caps)
{ {
int err = 0; int err = 0;
...@@ -564,7 +564,7 @@ static const u32 hw_atl_utils_hw_mac_regs[] = { ...@@ -564,7 +564,7 @@ static const u32 hw_atl_utils_hw_mac_regs[] = {
}; };
int hw_atl_utils_hw_get_regs(struct aq_hw_s *self, int hw_atl_utils_hw_get_regs(struct aq_hw_s *self,
struct aq_hw_caps_s *aq_hw_caps, const struct aq_hw_caps_s *aq_hw_caps,
u32 *regs_buff) u32 *regs_buff)
{ {
unsigned int i = 0U; unsigned int i = 0U;
......
...@@ -207,7 +207,7 @@ int hw_atl_utils_get_mac_permanent(struct aq_hw_s *self, ...@@ -207,7 +207,7 @@ int hw_atl_utils_get_mac_permanent(struct aq_hw_s *self,
unsigned int hw_atl_utils_mbps_2_speed_index(unsigned int mbps); unsigned int hw_atl_utils_mbps_2_speed_index(unsigned int mbps);
int hw_atl_utils_hw_get_regs(struct aq_hw_s *self, int hw_atl_utils_hw_get_regs(struct aq_hw_s *self,
struct aq_hw_caps_s *aq_hw_caps, const struct aq_hw_caps_s *aq_hw_caps,
u32 *regs_buff); u32 *regs_buff);
int hw_atl_utils_hw_set_power(struct aq_hw_s *self, int hw_atl_utils_hw_set_power(struct aq_hw_s *self,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment