[PATCH net-next] liquidio: remove set but not used variable 'is25G'

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

drivers/net/ethernet/cavium/liquidio/lio_ethtool.c: In function 'lio_set_link_ksettings':
drivers/net/ethernet/cavium/liquidio/lio_ethtool.c:392:6: warning:
 variable 'is25G' set but not used [-Wunused-but-set-variable]

Signed-off-by: YueHaibing <redacted>
---
 drivers/net/ethernet/cavium/liquidio/lio_ethtool.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/drivers/net/ethernet/cavium/liquidio/lio_ethtool.c b/drivers/net/ethernet/cavium/liquidio/lio_ethtool.c
index 807ea2c..5ce604a 100644
--- a/drivers/net/ethernet/cavium/liquidio/lio_ethtool.c
+++ b/drivers/net/ethernet/cavium/liquidio/lio_ethtool.c

@@ -389,16 +389,13 @@ static int lio_set_link_ksettings(struct net_device *netdev,
 	struct lio *lio = GET_LIO(netdev);
 	struct oct_link_info *linfo;
 	struct octeon_device *oct;
-	u32 is25G = 0;
 
 	oct = lio->oct_dev;
 
 	linfo = &lio->linfo;
 
-	if (oct->subsystem_id == OCTEON_CN2350_25GB_SUBSYS_ID ||
-	    oct->subsystem_id == OCTEON_CN2360_25GB_SUBSYS_ID) {
-		is25G = 1;
-	} else {
+	if (!(oct->subsystem_id == OCTEON_CN2350_25GB_SUBSYS_ID ||
+	      oct->subsystem_id == OCTEON_CN2360_25GB_SUBSYS_ID)) {
 		return -EOPNOTSUPP;
 	}
 

-- 
2.7.0

You can also remove braces which are not required for single line.

Thanks,
Shahed

On 2018/8/13 17:08, Shaikh, Shahed wrote:

quoted

-----Original Message-----
From: netdev-owner@vger.kernel.org <redacted> On
Behalf Of YueHaibing
Sent: Monday, August 13, 2018 12:51 PM
To: davem@davemloft.net; Chickles, Derek <redacted>;
Burla, Satananda [off-list ref]; Manlunas, Felix
[off-list ref]; Vatsavayi, Raghu
[off-list ref]
Cc: linux-kernel@vger.kernel.org; netdev@vger.kernel.org; YueHaibing
[off-list ref]
Subject: [PATCH net-next] liquidio: remove set but not used variable 'is25G'

External Email

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

drivers/net/ethernet/cavium/liquidio/lio_ethtool.c: In function
'lio_set_link_ksettings':
drivers/net/ethernet/cavium/liquidio/lio_ethtool.c:392:6: warning:
 variable 'is25G' set but not used [-Wunused-but-set-variable]

Signed-off-by: YueHaibing <redacted>
---
 drivers/net/ethernet/cavium/liquidio/lio_ethtool.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/drivers/net/ethernet/cavium/liquidio/lio_ethtool.c

b/drivers/net/ethernet/cavium/liquidio/lio_ethtool.c
index 807ea2c..5ce604a 100644

--- a/drivers/net/ethernet/cavium/liquidio/lio_ethtool.c
+++ b/drivers/net/ethernet/cavium/liquidio/lio_ethtool.c

@@ -389,16 +389,13 @@ static int lio_set_link_ksettings(struct net_device

*netdev,
        struct lio *lio = GET_LIO(netdev);
        struct oct_link_info *linfo;
        struct octeon_device *oct;
-       u32 is25G = 0;

        oct = lio->oct_dev;

        linfo = &lio->linfo;

-       if (oct->subsystem_id == OCTEON_CN2350_25GB_SUBSYS_ID ||
-           oct->subsystem_id == OCTEON_CN2360_25GB_SUBSYS_ID) {
-               is25G = 1;
-       } else {
+       if (!(oct->subsystem_id == OCTEON_CN2350_25GB_SUBSYS_ID ||
+             oct->subsystem_id == OCTEON_CN2360_25GB_SUBSYS_ID)) {
                return -EOPNOTSUPP;
        }

You can also remove braces which are not required for single line.

Yes, thanks.  Will post v2

Thanks,
Shahed