From patchwork Thu Nov 3 08:07:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: zhang.songyi@zte.com.cn X-Patchwork-Id: 14754 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp387235wru; Thu, 3 Nov 2022 01:16:55 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4wmQcd0UpcD520tEsAp27xPGmXKKGNTHjAQp/Hbw6i72SACtsmFHBCQzzrBAh4mT2SeiKC X-Received: by 2002:a05:6402:428f:b0:454:c988:4bb1 with SMTP id g15-20020a056402428f00b00454c9884bb1mr28348576edc.196.1667463415284; Thu, 03 Nov 2022 01:16:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667463415; cv=none; d=google.com; s=arc-20160816; b=VZpJi6KEL3fSoc8fbic7FM8Kbg1DsKM8SOHdDkzLBT4tfGWVVsg+cHE4zqn06t6F7t 0Bvc848JwUcbjZHo46ekWpRXPkh5IvopBp0AmYxbNaQ0vqwP9AB1Dz5wcaRJQt+sDWCq FO6rDMIndeHsgvtYaiKdcxeWVq43seVG3CqEHimlkCLLj9mt3bnnE/n7NPL867bGgTeL 5sov/Uic4j9ElT6zJFZmnc/VSzbhXFgPlxPRKMadcleojiY6nGpWQqf/d1uEtQE0xdAx oI8XC84J6A62gK0FFgti19oyXi+Fgt8rleAFHOxRD8yv1TjaZxI6bR1V2MegdpBPMXL5 CzNw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:subject:cc:to:from:mime-version:message-id:date; bh=bVQBzgQ0yuppPZziWuEz5U7wWk/h6SCK0peGZZA67Hw=; b=XOjtt1zgWuEK0RPZaCfFKA6GjADcPg+FFbGG4ajIUOedqt7oJot55o+E03nqU31JCh G6jA3iIZEAgtpKg40yZB34C4WV4keOUlbUBsdmjOCF2IPJM9+c4Kg3Y7fRnypeS0wvqM ncNnbPwSD2CLnjAbznqVrbJwX63uK9ecQUO4qEJtN5GOvbMKPHK+v4YdrQytqBv0AuDE JcOijG2Aa6ayAHcs84f5TrcmTOIfjQVvC1UXAS9Z7koRcZIQtFXb94/JMAEh8M4tN/Uy jY4mKp8KBj+ngUeC+KwGGa5kNBkl3vY8nAM/4hH9SQXfjN/Sxjb0HIwzre6SU4GdZhMl bSNA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=zte.com.cn Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id cw15-20020a170906478f00b0073d5f9aa5e9si480923ejc.327.2022.11.03.01.16.31; Thu, 03 Nov 2022 01:16:55 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=zte.com.cn Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230171AbiKCIPZ (ORCPT + 99 others); Thu, 3 Nov 2022 04:15:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32830 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229551AbiKCIPX (ORCPT ); Thu, 3 Nov 2022 04:15:23 -0400 X-Greylist: delayed 437 seconds by postgrey-1.37 at lindbergh.monkeyblade.net; Thu, 03 Nov 2022 01:15:20 PDT Received: from mxus.zte.com.cn (mxus.zte.com.cn [20.112.44.237]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D66C61BC; Thu, 3 Nov 2022 01:15:20 -0700 (PDT) Received: from mxhk.zte.com.cn (unknown [192.168.250.137]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mxus.zte.com.cn (FangMail) with ESMTPS id 4N2xFs4kncz9tyW5; Thu, 3 Nov 2022 16:08:01 +0800 (CST) Received: from mse-fl2.zte.com.cn (unknown [10.5.228.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mxhk.zte.com.cn (FangMail) with ESMTPS id 4N2xFp2Rk2z8QrkZ; Thu, 3 Nov 2022 16:07:58 +0800 (CST) Received: from xaxapp01.zte.com.cn ([10.88.40.50]) by mse-fl2.zte.com.cn with SMTP id 2A387iG9057025; Thu, 3 Nov 2022 16:07:44 +0800 (+08) (envelope-from zhang.songyi@zte.com.cn) Received: from mapi (xaxapp01[null]) by mapi (Zmail) with MAPI id mid31; Thu, 3 Nov 2022 16:07:46 +0800 (CST) Date: Thu, 3 Nov 2022 16:07:46 +0800 (CST) X-Zmail-TransId: 2af9636376d27d692465 X-Mailer: Zmail v1.0 Message-ID: <202211031607462393505@zte.com.cn> Mime-Version: 1.0 From: To: Cc: , , , , , , , , Subject: =?utf-8?q?Subject=3A_=5BPATCH_linux-next=5D_i2c=3A_npcm7xx=3A_remov?= =?utf-8?q?e_redundant_ret_variable?= X-MAIL: mse-fl2.zte.com.cn 2A387iG9057025 X-Fangmail-Gw-Spam-Type: 0 X-FangMail-Miltered: at 10-207-168-7 with ID 636376E0.000 by FangMail milter! X-FangMail-Envelope: 1667462881/4N2xFs4kncz9tyW5/636376E0.000/192.168.250.137/[192.168.250.137]/mxhk.zte.com.cn/ X-Fangmail-Anti-Spam-Filtered: true X-Fangmail-MID-QID: 636376E0.000/4N2xFs4kncz9tyW5 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_PASS,UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1748462118073902122?= X-GMAIL-MSGID: =?utf-8?q?1748462118073902122?= From: zhang songyi Return value from npcm_i2c_get_slave_addr() directly instead of taking this in another redundant variable. Reported-by: Zeal Robot Signed-off-by: zhang songyi --- drivers/i2c/busses/i2c-npcm7xx.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) -- 2.15.2 diff --git a/drivers/i2c/busses/i2c-npcm7xx.c b/drivers/i2c/busses/i2c-npcm7xx.c index bbc7359e67f7..772967862003 100644 --- a/drivers/i2c/busses/i2c-npcm7xx.c +++ b/drivers/i2c/busses/i2c-npcm7xx.c @@ -858,14 +858,10 @@ static void npcm_i2c_master_abort(struct npcm_i2c *bus) #if IS_ENABLED(CONFIG_I2C_SLAVE) static u8 npcm_i2c_get_slave_addr(struct npcm_i2c *bus, enum i2c_addr addr_type) { - u8 slave_add; - if (addr_type > I2C_SLAVE_ADDR2 && addr_type <= I2C_SLAVE_ADDR10) dev_err(bus->dev, "get slave: try to use more than 2 SA not supported\n"); - slave_add = ioread8(bus->reg + npcm_i2caddr[(int)addr_type]); - - return slave_add; + return ioread8(bus->reg + npcm_i2caddr[(int)addr_type]); } static int npcm_i2c_remove_slave_addr(struct npcm_i2c *bus, u8 slave_add)