net: lan78xx: Avoid unnecessary self assignment

Clang warns when a variable is assigned to itself.

drivers/net/usb/lan78xx.c:940:11: warning: explicitly assigning value of
variable of type 'u32' (aka 'unsigned int') to itself [-Wself-assign]
                        offset = offset;
                        ~~~~~~ ^ ~~~~~~
1 warning generated.

Reorder the if statement to acheive the same result and avoid a self
assignment warning.

Link: https://github.com/ClangBuiltLinux/linux/issues/129
Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
[sw0312.kim: cherry-pick mainline commit 94e7c844990f to remove build warning with llvm/clang]
Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com>
Change-Id: I18dc3e4145348830101d9474c38700565faf4761

diff --git a/drivers/net/usb/lan78xx.c b/drivers/net/usb/lan78xx.c
index 949308a..4f4b414 100644 (file)
--- a/drivers/net/usb/lan78xx.c
+++ b/drivers/net/usb/lan78xx.c
@@ -962,11 +962,9 @@ static int lan78xx_read_otp(struct lan78xx_net *dev, u32 offset,
        ret = lan78xx_read_raw_otp(dev, 0, 1, &sig);
 
        if (ret == 0) {
-               if (sig == OTP_INDICATOR_1)
-                       offset = offset;
-               else if (sig == OTP_INDICATOR_2)
+               if (sig == OTP_INDICATOR_2)
                        offset += 0x100;
-               else
+               else if (sig != OTP_INDICATOR_1)
                        ret = -EINVAL;
                if (!ret)
                        ret = lan78xx_read_raw_otp(dev, offset, length, data);