nfp: use unsigned int for vector/ring counts

Use unsigned int consistently for vector/ring counts.

Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net.h b/drivers/net/ethernet/netronome/nfp/nfp_net.h
index 55a497c0223765a131ef50bc285696430b9a2b94..0ea6ebd329cf0a30d170b4bbc7074f774b0f6ea1 100644 (file)
--- a/drivers/net/ethernet/netronome/nfp/nfp_net.h
+++ b/drivers/net/ethernet/netronome/nfp/nfp_net.h
@@ -528,11 +528,11 @@ struct nfp_net {
        struct timer_list rx_filter_stats_timer;
        spinlock_t rx_filter_lock;
 
-       int max_tx_rings;
-       int max_rx_rings;
+       unsigned int max_tx_rings;
+       unsigned int max_rx_rings;
 
-       int num_tx_rings;
-       int num_rx_rings;
+       unsigned int num_tx_rings;
+       unsigned int num_rx_rings;
 
        int stride_tx;
        int stride_rx;
@@ -540,8 +540,8 @@ struct nfp_net {
        int txd_cnt;
        int rxd_cnt;
 
-       u8 num_irqs;
-       u8 num_r_vecs;
+       unsigned int num_irqs;
+       unsigned int num_r_vecs;
        struct nfp_net_r_vector r_vecs[NFP_NET_MAX_R_VECS];
        struct msix_entry irq_entries[NFP_NET_MAX_IRQS];
 
@@ -757,8 +757,9 @@ extern const char nfp_net_driver_version[];
 void nfp_net_get_fw_version(struct nfp_net_fw_version *fw_ver,
                            void __iomem *ctrl_bar);
 
-struct nfp_net *nfp_net_netdev_alloc(struct pci_dev *pdev,
-                                    int max_tx_rings, int max_rx_rings);
+struct nfp_net *
+nfp_net_netdev_alloc(struct pci_dev *pdev,
+                    unsigned int max_tx_rings, unsigned int max_rx_rings);
 void nfp_net_netdev_free(struct nfp_net *nn);
 int nfp_net_netdev_init(struct net_device *netdev);
 void nfp_net_netdev_clean(struct net_device *netdev);

diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c
index 7225ab61a12026179b0741e68c54531a6a0c4b1e..49a1f54e07874983c957fa9d1b828389850f2615 100644 (file)
--- a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c
+++ b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c
@@ -318,8 +318,8 @@ static int nfp_net_msix_alloc(struct nfp_net *nn, int nr_vecs)
  */
 static int nfp_net_irqs_wanted(struct nfp_net *nn)
 {
+       unsigned int vecs;
        int ncpus;
-       int vecs;
 
        ncpus = num_online_cpus();
 
@@ -2701,7 +2701,8 @@ void nfp_net_info(struct nfp_net *nn)
  * Return: NFP Net device structure, or ERR_PTR on error.
  */
 struct nfp_net *nfp_net_netdev_alloc(struct pci_dev *pdev,
-                                    int max_tx_rings, int max_rx_rings)
+                                    unsigned int max_tx_rings,
+                                    unsigned int max_rx_rings)
 {
        struct net_device *netdev;
        struct nfp_net *nn;