Re: [PATCH net-next] net: liquidio: Remove set but not used variable

2020-09-19 Thread David Miller
From: Zheng Yongjun 
Date: Sat, 19 Sep 2020 09:31:23 +0800

> 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 

Applied.


[PATCH net-next] net: liquidio: Remove set but not used variable

2020-09-18 Thread Zheng Yongjun
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 
---
 drivers/net/ethernet/cavium/liquidio/octeon_device.c | 9 -
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/drivers/net/ethernet/cavium/liquidio/octeon_device.c 
b/drivers/net/ethernet/cavium/liquidio/octeon_device.c
index ac32facaa427..fbde7c58c4db 100644
--- a/drivers/net/ethernet/cavium/liquidio/octeon_device.c
+++ b/drivers/net/ethernet/cavium/liquidio/octeon_device.c
@@ -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(>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 & 0x, 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(>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 & 0x, oct->reg_list.pci_win_wr_data_lo);
 
-- 
2.17.1