Received: by 2002:a05:6358:d09b:b0:dc:cd0c:909e with SMTP id jc27csp1461610rwb; Wed, 16 Nov 2022 18:41:26 -0800 (PST) X-Google-Smtp-Source: AA0mqf5N9PUnYLthL2WoPivrnzjkld6cGQC9ObyWXNM8LduCn99JyBDus2XlpSm0xCWhI5EVeMFa X-Received: by 2002:a17:902:edc7:b0:188:b9b5:9695 with SMTP id q7-20020a170902edc700b00188b9b59695mr648286plk.147.1668652886552; Wed, 16 Nov 2022 18:41:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668652886; cv=none; d=google.com; s=arc-20160816; b=Kts5/WVhcOLf5UB01ky2RGlo4zsGy4mn/y4nEJJPKvnZ3TpNE5fXQBUzqDIME/rLTJ vk+E3ILiq7I4DX7Gnx84zFOrj5gkYng52x7eEYlP41BkBFXREAhWwxy0/x2wCM5Y3v2r Ha8wvJr2+x8SCl1+NpzN/3jpJd3TXgysOFuTiwGAmmnjaP6Lkh9hdmfs+Ot0PYyXxubT u9zE+fQGj2dMCIc9cD8kjFXIPqsO8R6p7t8X71xnonl1JV/J4PbfczDFcdoafaYONV+K QMdzTWHWs0JNTgKOVpRFNG8UcXWBoyLX8ubTPH7i5+kjn8vaHKMGRykG8FDBD4ebgEtp hEhw== 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=spzG/vFNACJfLvvQte7H6TjRPMlu2QkRYai1HccWuLk=; b=UpbLbB0Pu8xrznU51b8PgMeWd5w3bZ88sMEu9aEq7s+WLZI/7ffIHXiv5g5VDol5BG +KiecWR5w77yfeurs9pMLMZoEC1buCAniridLJhptAz1j6Ib63SjZ+N2HbWKjNTs+4zJ dSXCdoeKG4q/lSGwdLiKCE6grmc5ZF+RR46o8fFtqw2wEV1GkuIaLHG2N39ykK1YgT+0 Lsd8elsIzqDVDIQ4DQLqZzJr1MAyj+MM0dRtIJ15u89eIrKG7jlhSvUVwIP8bElCZpzt t8C0HkOYvyFtW/e0yO9zPNk8tsYJQ8aLDna3XbZMmwDTsLiOZ8fKYFfhsX5My9qakpCL FJ3A== 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 Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id k4-20020a170902c40400b001889ad48288si17074927plk.384.2022.11.16.18.41.15; Wed, 16 Nov 2022 18:41:26 -0800 (PST) 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 S234495AbiKQBxm (ORCPT + 90 others); Wed, 16 Nov 2022 20:53:42 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47596 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232097AbiKQBxk (ORCPT ); Wed, 16 Nov 2022 20:53:40 -0500 Received: from mxhk.zte.com.cn (mxhk.zte.com.cn [63.216.63.35]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 40162D7D; Wed, 16 Nov 2022 17:53:38 -0800 (PST) Received: from mxct.zte.com.cn (unknown [192.168.251.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mxhk.zte.com.cn (FangMail) with ESMTPS id 4NCNHP0HlQz4xVnR; Thu, 17 Nov 2022 09:53:37 +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 mxct.zte.com.cn (FangMail) with ESMTPS id 4NCNHM2811z501Qn; Thu, 17 Nov 2022 09:53:35 +0800 (CST) Received: from xaxapp01.zte.com.cn ([10.88.40.50]) by mse-fl2.zte.com.cn with SMTP id 2AH1rUJd095330; Thu, 17 Nov 2022 09:53:30 +0800 (+08) (envelope-from guo.ziliang@zte.com.cn) Received: from mapi (xaxapp03[null]) by mapi (Zmail) with MAPI id mid32; Thu, 17 Nov 2022 09:53:31 +0800 (CST) Date: Thu, 17 Nov 2022 09:53:31 +0800 (CST) X-Zmail-TransId: 2afb6375941bffffffffe743b8a8 X-Mailer: Zmail v1.0 Message-ID: <202211170953310238773@zte.com.cn> Mime-Version: 1.0 From: To: Cc: , , Subject: =?UTF-8?B?W1BBVENIIGxpbnV4LW5leHRdIHVzYjogZHdjMzogZ2FkZ2V0OiByZW1vdmUgcmVkdW5kYW50IHJldCB2YXJpYWJsZSBpbiBkd2MzX2dhZGdldF92YnVzX2RyYXc=?= Content-Type: text/plain; charset="UTF-8" X-MAIL: mse-fl2.zte.com.cn 2AH1rUJd095330 X-Fangmail-Gw-Spam-Type: 0 X-FangMail-Miltered: at cgslv5.04-192.168.250.138.novalocal with ID 63759421.000 by FangMail milter! X-FangMail-Envelope: 1668650017/4NCNHP0HlQz4xVnR/63759421.000/192.168.251.13/[192.168.251.13]/mxct.zte.com.cn/ X-Fangmail-Anti-Spam-Filtered: true X-Fangmail-MID-QID: 63759421.000/4NCNHP0HlQz4xVnR 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 From: guo ziliang Return value from dwc3_gadget_vbus_draw() directly instead of taking this in another redundant variable. Signed-off-by: guo ziliang --- drivers/usb/dwc3/gadget.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c index faf37c6..d984d68 100644 --- a/drivers/usb/dwc3/gadget.c +++ b/drivers/usb/dwc3/gadget.c @@ -2904,7 +2904,6 @@ static int dwc3_gadget_vbus_draw(struct usb_gadget *g, unsigned int mA) { struct dwc3 *dwc = gadget_to_dwc(g); union power_supply_propval val = {0}; - int ret; if (dwc->usb2_phy) return usb_phy_set_power(dwc->usb2_phy, mA); @@ -2913,9 +2912,7 @@ static int dwc3_gadget_vbus_draw(struct usb_gadget *g, unsigned int mA) return -EOPNOTSUPP; val.intval = 1000 * mA; - ret = power_supply_set_property(dwc->usb_psy, POWER_SUPPLY_PROP_INPUT_CURRENT_LIMIT, &val); - - return ret; + return power_supply_set_property(dwc->usb_psy, POWER_SUPPLY_PROP_INPUT_CURRENT_LIMIT, &val); } /** -- 1.8.3.1