From patchwork Mon Dec 20 14:34:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 526572 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9F53FC433F5 for ; Mon, 20 Dec 2021 14:36:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233811AbhLTOgX (ORCPT ); Mon, 20 Dec 2021 09:36:23 -0500 Received: from ams.source.kernel.org ([145.40.68.75]:44776 "EHLO ams.source.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233789AbhLTOgW (ORCPT ); Mon, 20 Dec 2021 09:36:22 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id C86F5B80EEE; Mon, 20 Dec 2021 14:36:20 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 20DA2C36AF8; Mon, 20 Dec 2021 14:36:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1640010979; bh=anQhNszbzPGOENSnfAwIhtLRNbzlLFGfaWmRrgmHhJI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QbN3Bs1rVBwpYPkLEOR8jOCr/ebwvxXYhyjfcpbPBQS+TwaGWoptqn8ILiARFHpXR AcLSAxKuIbkqqnbfM70jEaShsZSuhKyRL97JU8TEwqk6lSkDQfUFcuzrpKKQaUfnfS IJfAddlvLJeq6B68mInG9o2DvwMR47rnQ2CrVK8I= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Nathan Chancellor , "David S. Miller" , Anders Roxell Subject: [PATCH 4.4 17/23] net: lan78xx: Avoid unnecessary self assignment Date: Mon, 20 Dec 2021 15:34:18 +0100 Message-Id: <20211220143018.407071323@linuxfoundation.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20211220143017.842390782@linuxfoundation.org> References: <20211220143017.842390782@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Nathan Chancellor 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: Nathan Chancellor Signed-off-by: David S. Miller Signed-off-by: Anders Roxell Signed-off-by: Greg Kroah-Hartman --- drivers/net/usb/lan78xx.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) --- a/drivers/net/usb/lan78xx.c +++ b/drivers/net/usb/lan78xx.c @@ -609,11 +609,9 @@ static int lan78xx_read_otp(struct lan78 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);