]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
net: liquidio: Remove set but not used variable
authorZheng Yongjun <zhengyongjun3@huawei.com>
Sat, 19 Sep 2020 01:31:23 +0000 (09:31 +0800)
committerDavid S. Miller <davem@davemloft.net>
Sat, 19 Sep 2020 21:13:18 +0000 (14:13 -0700)
Fixes gcc '-Wunused-but-set-variable' warning:

drivers/net/ethernet/cavium/liquidio/octeon_device.c: In function lio_pci_readq:
drivers/net/ethernet/cavium/liquidio/octeon_device.c:1327:6: warning: variable ‘val32’ set but not used [-Wunused-but-set-variable]

drivers/net/ethernet/cavium/liquidio/octeon_device.c: In function lio_pci_writeq:
drivers/net/ethernet/cavium/liquidio/octeon_device.c:1358:6: warning: variable ‘val32’ set but not used [-Wunused-but-set-variable]

these variable is never used, so remove it.

Signed-off-by: Zheng Yongjun <zhengyongjun3@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/cavium/liquidio/octeon_device.c

index ac32facaa427d30d77f523446d523a630339f480..fbde7c58c4db840e5257e4ebc6d1bfc29898cab6 100644 (file)
@@ -1324,7 +1324,7 @@ u64 lio_pci_readq(struct octeon_device *oct, u64 addr)
 {
        u64 val64;
        unsigned long flags;
-       u32 val32, addrhi;
+       u32 addrhi;
 
        spin_lock_irqsave(&oct->pci_win_lock, flags);
 
@@ -1339,10 +1339,10 @@ u64 lio_pci_readq(struct octeon_device *oct, u64 addr)
        writel(addrhi, oct->reg_list.pci_win_rd_addr_hi);
 
        /* Read back to preserve ordering of writes */
-       val32 = readl(oct->reg_list.pci_win_rd_addr_hi);
+       readl(oct->reg_list.pci_win_rd_addr_hi);
 
        writel(addr & 0xffffffff, oct->reg_list.pci_win_rd_addr_lo);
-       val32 = readl(oct->reg_list.pci_win_rd_addr_lo);
+       readl(oct->reg_list.pci_win_rd_addr_lo);
 
        val64 = readq(oct->reg_list.pci_win_rd_data);
 
@@ -1355,7 +1355,6 @@ void lio_pci_writeq(struct octeon_device *oct,
                    u64 val,
                    u64 addr)
 {
-       u32 val32;
        unsigned long flags;
 
        spin_lock_irqsave(&oct->pci_win_lock, flags);
@@ -1365,7 +1364,7 @@ void lio_pci_writeq(struct octeon_device *oct,
        /* The write happens when the LSB is written. So write MSB first. */
        writel(val >> 32, oct->reg_list.pci_win_wr_data_hi);
        /* Read the MSB to ensure ordering of writes. */
-       val32 = readl(oct->reg_list.pci_win_wr_data_hi);
+       readl(oct->reg_list.pci_win_wr_data_hi);
 
        writel(val & 0xffffffff, oct->reg_list.pci_win_wr_data_lo);