From patchwork Fri Jan 20 15:44:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 46431 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp271037wrn; Fri, 20 Jan 2023 07:46:01 -0800 (PST) X-Google-Smtp-Source: AMrXdXsOL9kvR89AXQFqVivWECB24b5BVBhQeOxMvgpR+zV63Af6uGpngdnFxXjG6e0FUBn4ZhNZ X-Received: by 2002:a17:90a:db16:b0:210:a769:7ea1 with SMTP id g22-20020a17090adb1600b00210a7697ea1mr37548163pjv.47.1674229560709; Fri, 20 Jan 2023 07:46:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674229560; cv=none; d=google.com; s=arc-20160816; b=X5Ic2V2nF/Kpj8RP+rirxyTsNaW6/MJCmmtAkQJV7C+DWSMUp/mxnPE1fump7MaqvN CFu+wRObdQE6uQPE++ZUWCA7SXvriEPzNsHTUJKfRrZuxxg/va3DT0z4nBC4EK/LyIpd NV6qK/VKZ6bykYDw9h5Cj+94eTwPlj/MIwSjOsuuyRsOHhfEZRTEHUqKVJz7M9pQKG+M TYnfTZpiJhYcAo1Sj2WfRSYxzj+DD30Q7Scq7lDU4wdxRopst5gzf1mkvc99O31niGVM b8T1hIm2v2xXjhfdYRqApi1bU37x4nlqt8sTKMqJEjpvREU+ybeuXJ8xDNqW7KTCzou8 ACoQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=cZJgd0qLPDQuEIDIztLQeyh01q8V8fp4Qk7MgKA4JdI=; b=Cd2DVPFcDuymKJQpG28cGJFKNSCifnIFBomAajt28cKuDeUQ7AJcXoCaBxRHzmM9TR h4d9a1t+1WSU9NkK8Jr+LeBCD53J9Pwbh4TBtUR+EUN7tFVXoCJrQJYb+O/bvLbkBX8r N5UEJ0Io9w8RPMS3h20rfu8c6y+AS+pOR1DVrq0OmPergkEp4Ned4MMB3QITKTMIeDmf v7sCxYF49QtxY7z68VgZA+jXNrLNJCTGzqERPPFdjST2FZAXNy6kB3udec1HmRtgcflJ h/Yc8Y+AE5df5WPxM1C+I0GXI4+cj+rDwf+Eeg58Q1zVOBpvAdJzWr5s+Jg1GVZDOAla fVxg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=LVhdOo43; 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=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id dw15-20020a17090b094f00b00229763e2ec8si2772727pjb.143.2023.01.20.07.45.48; Fri, 20 Jan 2023 07:46:00 -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; dkim=pass header.i=@intel.com header.s=Intel header.b=LVhdOo43; 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=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229940AbjATPoJ (ORCPT + 99 others); Fri, 20 Jan 2023 10:44:09 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46876 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229683AbjATPoI (ORCPT ); Fri, 20 Jan 2023 10:44:08 -0500 Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 66D5559264; Fri, 20 Jan 2023 07:44:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1674229447; x=1705765447; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=oBVSJGdmqluJ+m0kpxYQdXUIQZYypRK6F57krHn+9Cs=; b=LVhdOo43ck4HjZ8K7sa6VjjR/sf/qeAD5nK1IOTcOqW741LcPgsuztJP 4s7RuWtrC4gt9D5C4D+QfGhV6Ct42fCaQNIacOWYcfpEgwT/8jj4K7YGV FNPpJVSACLKedwMxEFmzCXNbMUTtZGCPzxJGmneGha+Rz21qVqdwT3sF7 pSCb4m+m79DKHAb3PmuRvMerA6vuXIEAfyOD4aSppGXO6oWZVHfnGffeg lo/tPDQgGjAALOroCFGb2i4gNLY+ApMoQK90vEHPC+bxTaRYiz03w7O02 mWt4OrJRmk1CcRajMzYfFd6+7LF/NFJ9Iw4nvxLs5tJ+cynfiFhsqTAHS g==; X-IronPort-AV: E=McAfee;i="6500,9779,10596"; a="390114958" X-IronPort-AV: E=Sophos;i="5.97,232,1669104000"; d="scan'208";a="390114958" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Jan 2023 07:44:06 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10596"; a="989427700" X-IronPort-AV: E=Sophos;i="5.97,232,1669104000"; d="scan'208";a="989427700" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga005.fm.intel.com with ESMTP; 20 Jan 2023 07:44:04 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id E7A85368; Fri, 20 Jan 2023 17:44:39 +0200 (EET) From: Andy Shevchenko To: Linus Walleij , Greg Kroah-Hartman , linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Andy Shevchenko Subject: [PATCH v1 1/5] usb: fotg210-hcd: use sysfs_emit() to instead of scnprintf() Date: Fri, 20 Jan 2023 17:44:33 +0200 Message-Id: <20230120154437.22025-1-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.39.0 MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE 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?1755556935467463183?= X-GMAIL-MSGID: =?utf-8?q?1755556935467463183?= Follow the advice of the Documentation/filesystems/sysfs.rst and show() should only use sysfs_emit() or sysfs_emit_at() when formatting the value to be returned to user space. Signed-off-by: Andy Shevchenko Reviewed-by: Linus Walleij --- drivers/usb/fotg210/fotg210-hcd.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/usb/fotg210/fotg210-hcd.c b/drivers/usb/fotg210/fotg210-hcd.c index 7bd1e8f3080d..46752a75c428 100644 --- a/drivers/usb/fotg210/fotg210-hcd.c +++ b/drivers/usb/fotg210/fotg210-hcd.c @@ -4686,14 +4686,11 @@ static ssize_t uframe_periodic_max_show(struct device *dev, struct device_attribute *attr, char *buf) { struct fotg210_hcd *fotg210; - int n; fotg210 = hcd_to_fotg210(bus_to_hcd(dev_get_drvdata(dev))); - n = scnprintf(buf, PAGE_SIZE, "%d\n", fotg210->uframe_periodic_max); - return n; + return sysfs_emit(buf, "%d\n", fotg210->uframe_periodic_max); } - static ssize_t uframe_periodic_max_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) { From patchwork Fri Jan 20 15:44:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 46435 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp271692wrn; Fri, 20 Jan 2023 07:47:26 -0800 (PST) X-Google-Smtp-Source: AMrXdXuSzEiZVbfOY55AOo/nEIajo1WLN3u+a+3h0NHPvHcCq8hhaPGykCtoH7SU2v7br7yXPuWn X-Received: by 2002:a05:6a00:288c:b0:586:8ead:a8e8 with SMTP id ch12-20020a056a00288c00b005868eada8e8mr17206555pfb.8.1674229646359; Fri, 20 Jan 2023 07:47:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674229646; cv=none; d=google.com; s=arc-20160816; b=YLTUBiIAr5HZJAr1P1iWR9lci5++AtxMzhfKBB/fpV9XW8vDo3GJEF8C1MJYVurnaW Sduq/AkmTYQW+ELjQ2ATOUgLBDOc6Wu0YILenv6U8rlHEPvyulTTSE24xn4I+sJaQi+A YwdnziVDLIUA+dqinJB6CPvCFXFZCRo3Tjsr+KZyY21+rrQku5qe36QjbZR+HsaXE83i UIIF0ZW0E/pZEN8zmX2TeWSVWL26ftV7R5XfhupSNzw69DxOOYYky+ftqHlCz/vMaW7S yvQU1XSMPmnbVeUc4kiIjN9Qv3epcCtymIYw37k1FU7TWBc9rO5O5O1ZtCskunT+2A1u s9Fg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=8wC9ipMfg8le7SzFPb4kLVgWM4r4Ou15zfqJpwZUPDA=; b=ieRP6bY9LcrlCje5Bak1iikBsNi7yb9mEUHZZFROrX+RZWYJoTNBsC81m5Nx4vQz8k /RVOux3IZY9ih/+mQddh/pBntSxhIYjt9SsjzR6L2IpS21NsZ5JI69d2JAkkNJI3nlQy Woig0UupIqxPqRG+rq9jrbc2a3f3Q5TEVjk3k2eDew2Pw4rM4CebO0kyqdojG+HsBr5m DMpezRJmmLF8qzSw+X3dIojjmRnLfNYMQm0luUBDWdPXwROdqA0tg8looONZrOJ6jTX7 0ts8Rt3Nwb0+m8B7f0Z/8DTQJaxljD+OY4gOLmWGlMbAzm8SFUK82IbdUR81J7z8j3Lx ajYw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=V5wPBcTa; 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=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id x126-20020a623184000000b0058866177f92si34087234pfx.314.2023.01.20.07.47.14; Fri, 20 Jan 2023 07:47: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; dkim=pass header.i=@intel.com header.s=Intel header.b=V5wPBcTa; 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=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231366AbjATPoW (ORCPT + 99 others); Fri, 20 Jan 2023 10:44:22 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46898 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230061AbjATPoK (ORCPT ); Fri, 20 Jan 2023 10:44:10 -0500 Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3F635518EC; Fri, 20 Jan 2023 07:44:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1674229449; x=1705765449; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=KclXtp6RTwwDl0Jov5zoQLZjJ3zoGzOqCU2QiwmBSBo=; b=V5wPBcTaXOVkMHAiT9VCLqhFphYl+k6j7OClKUOxDSl2g3oFw8YnGZqt fMrCxbg+e6YehfejNkyeqdvsI1qrugARDYKh0Jw4kN187uzT7SdFAE8M8 ok8ZesY/jDg+/cKwB48jkQVqkzPEbqQwymnS6mlxgfTagZTzJs3Iv7p+0 +sBxuS830oyDiFQs7hdIEIs7QWOC/OiY6d4qM8+XusxTBYk4Lo2XWOO/E cj8tbkWswb5wPEI/GDpWr76IEXm7J6WuBdRw/5XtqT7XS5sfU8uRiyTMT tZtg1Q6T9TFUKTtPx4bP9Ndf1J/sL6T42yseF8M+m7QbVXVGEEZO42Dqn A==; X-IronPort-AV: E=McAfee;i="6500,9779,10596"; a="309179498" X-IronPort-AV: E=Sophos;i="5.97,232,1669104000"; d="scan'208";a="309179498" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Jan 2023 07:44:07 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10596"; a="610512126" X-IronPort-AV: E=Sophos;i="5.97,232,1669104000"; d="scan'208";a="610512126" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga003.jf.intel.com with ESMTP; 20 Jan 2023 07:44:05 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id F301F14A; Fri, 20 Jan 2023 17:44:39 +0200 (EET) From: Andy Shevchenko To: Linus Walleij , Greg Kroah-Hartman , linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Andy Shevchenko Subject: [PATCH v1 2/5] usb: fotg210-hcd: Don't shadow error codes in store() Date: Fri, 20 Jan 2023 17:44:34 +0200 Message-Id: <20230120154437.22025-2-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230120154437.22025-1-andriy.shevchenko@linux.intel.com> References: <20230120154437.22025-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,SPF_HELO_NONE,SPF_NONE 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?1755557025575389272?= X-GMAIL-MSGID: =?utf-8?q?1755557025575389272?= kstrtox() along with regmap API can return different error codes based on circumstances. Don't shadow them when returning to the caller. Signed-off-by: Andy Shevchenko Reviewed-by: Linus Walleij --- drivers/usb/fotg210/fotg210-hcd.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/usb/fotg210/fotg210-hcd.c b/drivers/usb/fotg210/fotg210-hcd.c index 46752a75c428..5a934f5343a7 100644 --- a/drivers/usb/fotg210/fotg210-hcd.c +++ b/drivers/usb/fotg210/fotg210-hcd.c @@ -4702,8 +4702,10 @@ static ssize_t uframe_periodic_max_store(struct device *dev, ssize_t ret; fotg210 = hcd_to_fotg210(bus_to_hcd(dev_get_drvdata(dev))); - if (kstrtouint(buf, 0, &uframe_periodic_max) < 0) - return -EINVAL; + + ret = kstrtouint(buf, 0, &uframe_periodic_max); + if (ret) + return ret; if (uframe_periodic_max < 100 || uframe_periodic_max >= 125) { fotg210_info(fotg210, "rejecting invalid request for uframe_periodic_max=%u\n", From patchwork Fri Jan 20 15:44:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 46432 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp271126wrn; Fri, 20 Jan 2023 07:46:10 -0800 (PST) X-Google-Smtp-Source: AMrXdXtU5yo0kMKPBzsbFf4etCAiA8bpQ7gNA46Orf6M/7MLcMEAIAH2OEHqXA6bBAjKXiwL6VL2 X-Received: by 2002:a17:903:2111:b0:194:75d6:c95d with SMTP id o17-20020a170903211100b0019475d6c95dmr13698849ple.37.1674229570034; Fri, 20 Jan 2023 07:46:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674229570; cv=none; d=google.com; s=arc-20160816; b=X3iB1gHUWCFPmu8cNZuefvFQIzs39V4Yx4/cjU+HL2ft/b6XYa/sfFon73Jv7TrGJW DiyKVnljTvLlYJeO+/CGO0ITMMl06QdP2xmbQt84ZQO4z7zRBkbO75z5VtlPLkObIbKr 5tA4+T62KSBHZgUutwOXcD38Hxf4gqvH+kS+VjmcqiAqyNSSypDdEhibner/TWs+vgR+ Aymqf3+yoVC3GqKOIc98J1nknnbnAICHSYhvtX8sU0dHL7FfJ71jAbM6FaEmkxfSIiWc uZMhBVyTZ5azPnDxU/TT1n5BQdvC8ECxo8+zpXvRnUrc6JxeyJNqeVhp/Pq+CwdbeCNQ LM3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=yoUWstbPSWy5xH4Wk+PjaK16sBcSDNVap2qg9mr3+WU=; b=JMtSbvIt4qiRxTkLy0vVaw8GkQLZll2TDE1prMjenUBA3kZ74DAz4vITC011nWIoAl he+OvIiWsozX/2sgROEdjtsupc7/4eNeXrhxWM+990FEpy8NE4+WqpIVjqCsWDt9ZioL UUQh0HzXKS/gIp99bXffMmEBF+mwrE7t9M/Y4SlOxyAVpcP/S2kL148fXCKNRcWO50Rx KWU6wSW073eOnnUPoU9/SjhrybPJn+uPgXiau3wNQTtY7m2HyXwyE7MmH+oQmrhfLVut 6hcBXoc/tKPfhgG48h8y45pVkIj8eVAUUGyPKoSGl/OlHZN5bvuI49nmdm3I7agg3BEL ci0A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=BbOlueFg; 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=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id o11-20020a170902d4cb00b00194d51f6607si4680104plg.456.2023.01.20.07.45.57; Fri, 20 Jan 2023 07:46:10 -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; dkim=pass header.i=@intel.com header.s=Intel header.b=BbOlueFg; 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=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230281AbjATPoN (ORCPT + 99 others); Fri, 20 Jan 2023 10:44:13 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46888 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229660AbjATPoJ (ORCPT ); Fri, 20 Jan 2023 10:44:09 -0500 Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E0AAA6A30D; Fri, 20 Jan 2023 07:44:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1674229447; x=1705765447; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Zvmz1e8tNVkf9F2k6v9cQ9mCVyAkLICIV32C307I3+A=; b=BbOlueFg5urU2fIRZkhnbjmOgZ8lI8vskiRtkaGnfGQWVfjdDzrG4qXw xgbtZAmLM/hVmnBu/1QZXPRDJ9zh3z0a7H+BvDCWlw2DdbT6l1YUe1u3x dv9uml+lx0dPdQWS9X2p9YF7rsZk4T17Eh6nYyG9SUtt6ZzP0ovK90GON 35HutaZ9blgcLU+9v3IMRomfagNFM5G0S4LGugNPbVgFI4SiiI4MgWCo7 s8OfDAWsFEbYALoJ3vHA/83CbcgubdmG2QtMr9D+wwg9BwBUxPIOIeXHb tveEtqmgXFfIfOubGZEjrRqFuXQ2t2nmelrOz7/06wbkbdjqrubTyTrbB w==; X-IronPort-AV: E=McAfee;i="6500,9779,10596"; a="309179502" X-IronPort-AV: E=Sophos;i="5.97,232,1669104000"; d="scan'208";a="309179502" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Jan 2023 07:44:07 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10596"; a="610512127" X-IronPort-AV: E=Sophos;i="5.97,232,1669104000"; d="scan'208";a="610512127" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga003.jf.intel.com with ESMTP; 20 Jan 2023 07:44:05 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id 048EA36D; Fri, 20 Jan 2023 17:44:40 +0200 (EET) From: Andy Shevchenko To: Linus Walleij , Greg Kroah-Hartman , linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Andy Shevchenko Subject: [PATCH v1 3/5] usb: fotg210-udc: remove redundant error logging Date: Fri, 20 Jan 2023 17:44:35 +0200 Message-Id: <20230120154437.22025-3-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230120154437.22025-1-andriy.shevchenko@linux.intel.com> References: <20230120154437.22025-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,SPF_HELO_NONE,SPF_NONE 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?1755556945562121133?= X-GMAIL-MSGID: =?utf-8?q?1755556945562121133?= A call to platform_get_irq() already prints an error on failure within its own implementation. So printing another error based on its return value in the caller is redundant and should be removed. The clean up also makes if condition block braces unnecessary. Remove that as well. Signed-off-by: Andy Shevchenko Reviewed-by: Linus Walleij --- drivers/usb/fotg210/fotg210-udc.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/usb/fotg210/fotg210-udc.c b/drivers/usb/fotg210/fotg210-udc.c index 4334504fccc8..18d254125186 100644 --- a/drivers/usb/fotg210/fotg210-udc.c +++ b/drivers/usb/fotg210/fotg210-udc.c @@ -1169,10 +1169,8 @@ int fotg210_udc_probe(struct platform_device *pdev, struct fotg210 *fotg) int i; irq = platform_get_irq(pdev, 0); - if (irq < 0) { - pr_err("could not get irq\n"); - return -ENODEV; - } + if (irq < 0) + return irq; /* initialize udc */ fotg210 = kzalloc(sizeof(struct fotg210_udc), GFP_KERNEL); From patchwork Fri Jan 20 15:44:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 46434 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp271678wrn; Fri, 20 Jan 2023 07:47:24 -0800 (PST) X-Google-Smtp-Source: AMrXdXtXh476wruiukoIQrNVoZjUDIHgZhbBt3C4aUBB3Ff54iAqazEdNp32hmmjgHvHY+mVEwJE X-Received: by 2002:a62:388a:0:b0:581:140:f3b6 with SMTP id f132-20020a62388a000000b005810140f3b6mr14656667pfa.34.1674229643824; Fri, 20 Jan 2023 07:47:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674229643; cv=none; d=google.com; s=arc-20160816; b=FKlD8BgFhtLKuLByQ1PxYDZXx5TkcBNHWMxtu2L5JR8KYZXKO5OsJ6cz5MFrL/WuBw idkEDL6E8d0+7oyihciX479gbHwvHQ5A3inoyZ7NaG/Irp9XhmtstaOyk0yTV/Dvm+Tq PC4MxbsoFdKTNJA/H1wdhKqunZI/RFZhnS2i8OtAVIs0rNknK4ksEdHztr4hP6q0+9YY VCySat+5wiKn1J8WQgfrjIoZw9pAsdY7CGZXkJDlpOwFHFbxw5LvuwWyTatk5qqtYD3V RULR3M/MZTSnFjkwGeMBDJlhkVY94luAGbc1KXlw8i8ekFAlxotT7J7NUgi0Pxxeh1uF cWEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=ML0Cr1RCcXlc/+1EelQS98OnkzV2olmVKzzoohKPzjM=; b=HW5Fg69Uh7o54qec2WAVw6FV2nRvysNH/WDzbrM84Lfb/Iw4lTIdbDAgAXZ4iKHCxV g8OaT12f3p3uIDyJOqBBX9M9jgRDBkaSEnymKCRXxg2it40vjmy71r9Ao+lqvhON7QPR 4m/3/MRLbfNFVzI+6t/DrrEXuFBn8U/P2n/DfNY0uhoHh1XDNJESw+yCGTkFmU9iBMrL 8fRHv1L0qnWnkRlcQnHQFKRtmCo7Hg1Y7jXtj8PpA2jQeMq3y3Kstbp/pxm9MgcYsgX/ kcb/trJWIghVGgG9gjj0U83pqk+cLYt2GUJcd7msBQvKpWNsCvQIhGUjjU3Z8vyv47rM chRw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=cYsOsDUj; 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=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id e33-20020a635461000000b00477b463b049si35787606pgm.491.2023.01.20.07.47.10; Fri, 20 Jan 2023 07:47:23 -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; dkim=pass header.i=@intel.com header.s=Intel header.b=cYsOsDUj; 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=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231220AbjATPoT (ORCPT + 99 others); Fri, 20 Jan 2023 10:44:19 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46894 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229752AbjATPoJ (ORCPT ); Fri, 20 Jan 2023 10:44:09 -0500 Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C49596A329; Fri, 20 Jan 2023 07:44:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1674229448; x=1705765448; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=RqbRnx0DzcmLHk0wnUNW8548wFkwKC+fI9KpOtosq6c=; b=cYsOsDUjw27nWLQLH4VBWH6bwvvKtz1R6gUnnMCtD8O09Z694vixs/97 SHAO4t5Lz7bVRkLGp6PiyL+3RiAmK4dz2hHxOzMk9oPHqhnOzIZ/ngC55 1bEuBtgvJsCUKJHlZ2rUROQyDIO34Rqpg+ExCeVDKW9Vy8sLxtUD86RLe Y4j30Qu3CqjOUejgEOT0nPsBmmVXIegtazJP9y0672g64hYeVjGGw9mtX T3CD3HgY/6Wsw2irboAHaO6WfwAo6jmp1mOnWsU4a4wtPYMB1srxKDEPp KznMItBFZQbO25kB1Wy9m/o+/olbOs2sBtHGuhku6Skw+adWUgydLzggc Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10596"; a="390114961" X-IronPort-AV: E=Sophos;i="5.97,232,1669104000"; d="scan'208";a="390114961" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Jan 2023 07:44:07 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10596"; a="989427702" X-IronPort-AV: E=Sophos;i="5.97,232,1669104000"; d="scan'208";a="989427702" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga005.fm.intel.com with ESMTP; 20 Jan 2023 07:44:05 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id 134CE38F; Fri, 20 Jan 2023 17:44:40 +0200 (EET) From: Andy Shevchenko To: Linus Walleij , Greg Kroah-Hartman , linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Andy Shevchenko Subject: [PATCH v1 4/5] usb: fotg210: Switch to use dev_err_probe() Date: Fri, 20 Jan 2023 17:44:36 +0200 Message-Id: <20230120154437.22025-4-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230120154437.22025-1-andriy.shevchenko@linux.intel.com> References: <20230120154437.22025-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE 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?1755557023270579974?= X-GMAIL-MSGID: =?utf-8?q?1755557023270579974?= Switch to use dev_err_probe() to simplify the error paths and unify message template. Signed-off-by: Andy Shevchenko Reviewed-by: Linus Walleij --- drivers/usb/fotg210/fotg210-core.c | 6 ++---- drivers/usb/fotg210/fotg210-hcd.c | 8 +++----- drivers/usb/fotg210/fotg210-udc.c | 2 +- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/drivers/usb/fotg210/fotg210-core.c b/drivers/usb/fotg210/fotg210-core.c index c06f8eb3acbd..ce00d9407ce5 100644 --- a/drivers/usb/fotg210/fotg210-core.c +++ b/drivers/usb/fotg210/fotg210-core.c @@ -50,10 +50,8 @@ static int fotg210_gemini_init(struct fotg210 *fotg, struct resource *res, int ret; map = syscon_regmap_lookup_by_phandle(np, "syscon"); - if (IS_ERR(map)) { - dev_err(dev, "no syscon\n"); - return PTR_ERR(map); - } + if (IS_ERR(map)) + return dev_err_probe(dev, PTR_ERR(map), "no syscon\n"); fotg->map = map; wakeup = of_property_read_bool(np, "wakeup-source"); diff --git a/drivers/usb/fotg210/fotg210-hcd.c b/drivers/usb/fotg210/fotg210-hcd.c index 5a934f5343a7..613d29f04bcb 100644 --- a/drivers/usb/fotg210/fotg210-hcd.c +++ b/drivers/usb/fotg210/fotg210-hcd.c @@ -5575,8 +5575,7 @@ int fotg210_hcd_probe(struct platform_device *pdev, struct fotg210 *fotg) hcd = usb_create_hcd(&fotg210_fotg210_hc_driver, dev, dev_name(dev)); if (!hcd) { - dev_err(dev, "failed to create hcd\n"); - retval = -ENOMEM; + retval = dev_err_probe(dev, -ENOMEM, "failed to create hcd\n"); goto fail_create_hcd; } @@ -5600,7 +5599,7 @@ int fotg210_hcd_probe(struct platform_device *pdev, struct fotg210 *fotg) retval = usb_add_hcd(hcd, irq, IRQF_SHARED); if (retval) { - dev_err(dev, "failed to add hcd with err %d\n", retval); + dev_err_probe(dev, retval, "failed to add hcd\n"); goto failed_put_hcd; } device_wakeup_enable(hcd->self.controller); @@ -5611,8 +5610,7 @@ int fotg210_hcd_probe(struct platform_device *pdev, struct fotg210 *fotg) failed_put_hcd: usb_put_hcd(hcd); fail_create_hcd: - dev_err(dev, "init %s fail, %d\n", dev_name(dev), retval); - return retval; + return dev_err_probe(dev, retval, "init %s fail\n", dev_name(dev)); } /* diff --git a/drivers/usb/fotg210/fotg210-udc.c b/drivers/usb/fotg210/fotg210-udc.c index 18d254125186..5b515f5cb2d7 100644 --- a/drivers/usb/fotg210/fotg210-udc.c +++ b/drivers/usb/fotg210/fotg210-udc.c @@ -1258,7 +1258,7 @@ int fotg210_udc_probe(struct platform_device *pdev, struct fotg210 *fotg) ret = request_irq(irq, fotg210_irq, IRQF_SHARED, udc_name, fotg210); if (ret < 0) { - dev_err(dev, "request_irq error (%d)\n", ret); + dev_err_probe(dev, ret, "request_irq error\n"); goto err_req; } From patchwork Fri Jan 20 15:44:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 46433 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp271234wrn; Fri, 20 Jan 2023 07:46:27 -0800 (PST) X-Google-Smtp-Source: AMrXdXtJp1wjhc8qiJbzzOkWUf1RdJXGF1wtrNQybbnVU32XREI/RkXKNCh1oWu4fujTHVe3ZIf/ X-Received: by 2002:a17:90b:3b8b:b0:22b:bc63:55fd with SMTP id pc11-20020a17090b3b8b00b0022bbc6355fdmr474358pjb.6.1674229587216; Fri, 20 Jan 2023 07:46:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674229587; cv=none; d=google.com; s=arc-20160816; b=ODoSM6iuSYcX6gwe4azN5B2i8XHGQE5eNreh/rQwdQP4eMN2lN9qMZUx2Qq8EwtK8/ QmG3AV0308kDalHgq00ZObGq/jK6hlWg/o5JAImUBTIRmSh5EO9zzxW4aev/VcZUSMoG qsbHwD0MTx4LJkDTDLoJ+kE4NgAjzMtXXMX5hh2WaFRhDAiSja3dO/q+auy12kNdlwuD HoD/0ASXQnzLz5n1c0dRGSq19N3S0e/yqFpUWRIQ7ia3pLg8Pj5RrbnQ2xLM1PckGeDd 70f5OllWQGuFfM5LD46kmT0mgXG12NKZaLK0jMWI7dZAaUgeE1NxiXWp0ro6xJ+zL0RG H7Tg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=mfmz2zmHeMveVeiVjk4qDo/iuZlZFtKpeD9aCpSq2QY=; b=S3T6nccUDyXPLhWb9FUzEqoSrUw4D4MdNjm8kSm8NBio6sxwUSUAjI87FKIhsLO2EF uQHu0e4FtyfbAmtl4fxjHIbDUt/xVn+aYYv2nuFpGjUKdyGIGZaZErfFI42z9IKB4GoS VfYsXN3GpKgZJ+FgfjpXHMFLR1ihaBLXqkqRiMHL/4704frN9zJVj+L+ML0AAUfakwjj P57sezmlL9DcTO3GYA1g9ajI/Z5CQnRpEqs4BVN3x//82oDkIvFZ+R+6Ug8SWF8MxtqQ iAPv4JDv8HTg/VHLEHyuYRmDhKHfdGrRbpYroWGEpMY7s7Npiy0UtcjiztgeWI6YhSAV du6w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=U984D4Q3; 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=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id j63-20020a638042000000b004ccf5368e1dsi7811209pgd.110.2023.01.20.07.46.14; Fri, 20 Jan 2023 07:46:27 -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; dkim=pass header.i=@intel.com header.s=Intel header.b=U984D4Q3; 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=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230348AbjATPoR (ORCPT + 99 others); Fri, 20 Jan 2023 10:44:17 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46896 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229814AbjATPoJ (ORCPT ); Fri, 20 Jan 2023 10:44:09 -0500 Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F242F6A334; Fri, 20 Jan 2023 07:44:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1674229448; x=1705765448; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=6Qu9mgbn0uz4KQv860MeQD3YerquUjWp1+UWLUDD7Ng=; b=U984D4Q3e7ck21HEAPhZ1bmUnnP5eDxIG6xd77HOO5N1KNkiCpfXkGdK aeKf58fbjH1Q+KoFRRHahyqVgDk2viEBAW1I3d1WRwmLwPVYhGXnbSveR gkZs/xEi6kNqEjThM5OCVK14NvJilhFgRrASehgqLP//uzCbn7TON+7ty HxDIx0t9zqvSola27JcH0koJAiRZ11Ng6yO7bcW9fVUwa6r0IBYhoSrLP FLhLIrTtvBEqxc78xCzSuCCwOZr7DYQEvWPCVWETGz8UVCFR9qUPnMil7 k7Fq0gQi07T9hF1DmjTI+heXeY2SahEOLhqlG0VN7UC6L2on5x8fwsR97 w==; X-IronPort-AV: E=McAfee;i="6500,9779,10596"; a="390114963" X-IronPort-AV: E=Sophos;i="5.97,232,1669104000"; d="scan'208";a="390114963" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Jan 2023 07:44:07 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10596"; a="989427703" X-IronPort-AV: E=Sophos;i="5.97,232,1669104000"; d="scan'208";a="989427703" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga005.fm.intel.com with ESMTP; 20 Jan 2023 07:44:05 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id 18DC1373; Fri, 20 Jan 2023 17:44:40 +0200 (EET) From: Andy Shevchenko To: Linus Walleij , Greg Kroah-Hartman , linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Andy Shevchenko Subject: [PATCH v1 5/5] usb: fotg210: use devm_platform_get_and_ioremap_resource() Date: Fri, 20 Jan 2023 17:44:37 +0200 Message-Id: <20230120154437.22025-5-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230120154437.22025-1-andriy.shevchenko@linux.intel.com> References: <20230120154437.22025-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE 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?1755556963462104159?= X-GMAIL-MSGID: =?utf-8?q?1755556963462104159?= Convert platform_get_resource(), devm_ioremap_resource() to a single call to devm_platform_get_and_ioremap_resource(), as this is exactly what this function does. Signed-off-by: Andy Shevchenko Reviewed-by: Linus Walleij --- drivers/usb/fotg210/fotg210-core.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/drivers/usb/fotg210/fotg210-core.c b/drivers/usb/fotg210/fotg210-core.c index ce00d9407ce5..202d80adca2c 100644 --- a/drivers/usb/fotg210/fotg210-core.c +++ b/drivers/usb/fotg210/fotg210-core.c @@ -135,11 +135,7 @@ static int fotg210_probe(struct platform_device *pdev) return -ENOMEM; fotg->dev = dev; - fotg->res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - if (!fotg->res) - return -ENODEV; - - fotg->base = devm_ioremap_resource(dev, fotg->res); + fotg->base = devm_platform_get_and_ioremap_resource(pdev, 0, &fotg->res); if (!fotg->base) return -ENOMEM;