Commit 4ab10bb8 authored by YueHaibing's avatar YueHaibing Committed by David S. Miller

liquidio: remove set but not used variable 's'

Fixes gcc '-Wunused-but-set-variable' warning:

drivers/net/ethernet/cavium/liquidio/lio_main.c: In function 'octeon_chip_specific_setup':
drivers/net/ethernet/cavium/liquidio/lio_main.c:1378:8: warning:
 variable 's' set but not used [-Wunused-but-set-variable]

It's not used since commit b6334be6 ("net/liquidio: Delete driver version assignment")
Reported-by: default avatarHulk Robot <hulkci@huawei.com>
Signed-off-by: default avatarYueHaibing <yuehaibing@huawei.com>
Reviewed-by: default avatarLeon Romanovsky <leonro@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3ebaf6da
...@@ -1375,7 +1375,6 @@ static int octeon_chip_specific_setup(struct octeon_device *oct) ...@@ -1375,7 +1375,6 @@ static int octeon_chip_specific_setup(struct octeon_device *oct)
{ {
u32 dev_id, rev_id; u32 dev_id, rev_id;
int ret = 1; int ret = 1;
char *s;
pci_read_config_dword(oct->pci_dev, 0, &dev_id); pci_read_config_dword(oct->pci_dev, 0, &dev_id);
pci_read_config_dword(oct->pci_dev, 8, &rev_id); pci_read_config_dword(oct->pci_dev, 8, &rev_id);
...@@ -1385,13 +1384,11 @@ static int octeon_chip_specific_setup(struct octeon_device *oct) ...@@ -1385,13 +1384,11 @@ static int octeon_chip_specific_setup(struct octeon_device *oct)
case OCTEON_CN68XX_PCIID: case OCTEON_CN68XX_PCIID:
oct->chip_id = OCTEON_CN68XX; oct->chip_id = OCTEON_CN68XX;
ret = lio_setup_cn68xx_octeon_device(oct); ret = lio_setup_cn68xx_octeon_device(oct);
s = "CN68XX";
break; break;
case OCTEON_CN66XX_PCIID: case OCTEON_CN66XX_PCIID:
oct->chip_id = OCTEON_CN66XX; oct->chip_id = OCTEON_CN66XX;
ret = lio_setup_cn66xx_octeon_device(oct); ret = lio_setup_cn66xx_octeon_device(oct);
s = "CN66XX";
break; break;
case OCTEON_CN23XX_PCIID_PF: case OCTEON_CN23XX_PCIID_PF:
...@@ -1404,11 +1401,9 @@ static int octeon_chip_specific_setup(struct octeon_device *oct) ...@@ -1404,11 +1401,9 @@ static int octeon_chip_specific_setup(struct octeon_device *oct)
pci_sriov_set_totalvfs(oct->pci_dev, pci_sriov_set_totalvfs(oct->pci_dev,
oct->sriov_info.max_vfs); oct->sriov_info.max_vfs);
#endif #endif
s = "CN23XX";
break; break;
default: default:
s = "?";
dev_err(&oct->pci_dev->dev, "Unknown device found (dev_id: %x)\n", dev_err(&oct->pci_dev->dev, "Unknown device found (dev_id: %x)\n",
dev_id); dev_id);
} }
......
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