diff options
| author |   Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2015-03-05 19:02:35 -0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2015-03-05 22:11:38 -0500 |
| commit | e815665e1a8ca1525900377f74021c8cac390e8d (patch) | |
| tree | 0357905529e25e02ff5ceaaf9d59d0e7458c79f5 /drivers/net/ethernet/intel/i40e/i40e_main.c | |
| parent | tipc: add ip/udp media type (diff) | |
| download | linux-dev-e815665e1a8ca1525900377f74021c8cac390e8d.tar.xz linux-dev-e815665e1a8ca1525900377f74021c8cac390e8d.zip | |
i40e: Fix mismatching type for ioremap_len
As pointed out by Ben Hutchings, ioremap uses unsigned long as
its parameter type, so we should be using that instead of u32
or int.
Reported-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/ethernet/intel/i40e/i40e_main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c index fb369f773780..0937cf325e00 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_main.c +++ b/drivers/net/ethernet/intel/i40e/i40e_main.c @@ -9456,10 +9456,10 @@ static void i40e_print_features(struct i40e_pf *pf) static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent) { struct i40e_aq_get_phy_abilities_resp abilities; + unsigned long ioremap_len; struct i40e_pf *pf; struct i40e_hw *hw; static u16 pfs_found; - u32 ioremap_len; u16 link_status; int err = 0; u32 len; @@ -9509,7 +9509,7 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent) hw = &pf->hw; hw->back = pf; - ioremap_len = min_t(int, pci_resource_len(pdev, 0), + ioremap_len = min_t(unsigned long, pci_resource_len(pdev, 0), I40E_MAX_CSR_SPACE); hw->hw_addr = ioremap(pci_resource_start(pdev, 0), ioremap_len); |