Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cd98c0b5 authored by Nathan Chancellor's avatar Nathan Chancellor Committed by Greg Kroah-Hartman
Browse files

net: lan78xx: Avoid unnecessary self assignment

commit 94e7c844990f0db92418586b107be135b4963b66 upstream.

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: default avatarNathan Chancellor <natechancellor@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarAnders Roxell <anders.roxell@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8ed2f5d0
Loading
Loading
Loading
Loading
+2 −4
Original line number Original line Diff line number Diff line
@@ -609,11 +609,9 @@ static int lan78xx_read_otp(struct lan78xx_net *dev, u32 offset,
	ret = lan78xx_read_raw_otp(dev, 0, 1, &sig);
	ret = lan78xx_read_raw_otp(dev, 0, 1, &sig);


	if (ret == 0) {
	if (ret == 0) {
		if (sig == OTP_INDICATOR_1)
		if (sig == OTP_INDICATOR_2)
			offset = offset;
		else if (sig == OTP_INDICATOR_2)
			offset += 0x100;
			offset += 0x100;
		else
		else if (sig != OTP_INDICATOR_1)
			ret = -EINVAL;
			ret = -EINVAL;
		if (!ret)
		if (!ret)
			ret = lan78xx_read_raw_otp(dev, offset, length, data);
			ret = lan78xx_read_raw_otp(dev, offset, length, data);