From patchwork Fri Mar 1 17:55:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 208990 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:fa17:b0:10a:f01:a869 with SMTP id ju23csp45959dyc; Fri, 1 Mar 2024 09:57:29 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCW7EWx77cbmVnSMvdr+7ASRpl22gON1NtAtB7sO+JmMi44bg/gxR1GPsUFUEjEKwmTfhWmZ696cMS9In9DCY2/q1BScBw== X-Google-Smtp-Source: AGHT+IGwMEpWJ8txnMLPGiqcQvr/GUgnSFPOg1JwHSwL35iHcmgFrj1Jupt9QkV3QNfPgunEsTSW X-Received: by 2002:a05:6214:4241:b0:68f:fe7f:abff with SMTP id ne1-20020a056214424100b0068ffe7fabffmr2765261qvb.19.1709315849340; Fri, 01 Mar 2024 09:57:29 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1709315849; cv=pass; d=google.com; s=arc-20160816; b=uYEvAUZPpxrIQ4LChimHHV48EbIxj6rBMvKigsssjCxggy7ttwoHQcx7i+s5BB89MT 9IuDHHtRkhxL2DMWFBmPQL6rUoWM+V0lMvhn9Mh0aq6t1YRYB07EauMhoI/QgZlYKCdd b/pZ278DcqUTr/PY4NLXjvxEGRg8JdGm3FK0we4s/yJTNAZKb7oXRuX/ttuzKlfFZ2l7 ZpDxBqDZcI6+ZnU9uypJjlv5ZVL8L0wtPuYqr5QDcFxc3ISPNPAOMuplgzhulu9QyKRK dUT09S0YUpoI6Fn9RwMzRlswNL9DF5359qS1RJru6NgaeDLRfTtobwqarLVTyUi5vwNP S7nQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=RVwbCpD2LWqhl57gaAA1CoEhki6zdHOWlJULpqn9S8Q=; fh=e4PvYYku5zYFxmkUS0FiQcVXY6Dn4D9RCsxRy8Ff39g=; b=m9wLi3nHHbpEsdqYlF+4YLkkuVPV4Td+V51wl6WODwuPMbM6lW5ihRp8qVxmjlt8+B x1Fgtzv40IwzG6eRkurb6dARl6wsvTPE/aT3msQ6GHPSVBjAYIvL0sdat1GGQqnNhI9V pR1hJNOjg1qv86u/w2+ba7f7easok0RxIRCEsosrj44TD5hfItbwaDFdXRKeWkpNE/NC 3SEnTNugT2Y9I4jmygW93auW8z6FAfhZ86Kq/ATO0f7DV0Uq1rs+lvK2NbqBMSpWZu/4 +iMUrmQh+3Bbbu5FCJXaTqcXeLQ7d5oAQPXtcJ0K1lSrlf/JVpLJiWXNxod0s2EFn5Q4 HDKA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=nc9oRtRt; arc=pass (i=1 dkim=pass dkdomain=intel.com dmarc=pass fromdomain=linux.intel.com); spf=pass (google.com: domain of linux-kernel+bounces-88876-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-88876-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id e12-20020a0562141d0c00b0068c71d0cf61si3970382qvd.446.2024.03.01.09.57.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Mar 2024 09:57:29 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-88876-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=nc9oRtRt; arc=pass (i=1 dkim=pass dkdomain=intel.com dmarc=pass fromdomain=linux.intel.com); spf=pass (google.com: domain of linux-kernel+bounces-88876-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-88876-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 0EE131C253BC for ; Fri, 1 Mar 2024 17:57:29 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id EBACD374EC; Fri, 1 Mar 2024 17:56:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="nc9oRtRt" Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.15]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C8DEE1798F for ; Fri, 1 Mar 2024 17:56:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.15 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709315809; cv=none; b=P+/oSYjD8CQkShM1zAQvGPjJUXZCiLm/px5Eryhspnp/yRAfzciDn7sKHVUPFWQT7kGdH9i47puGXUezL1yVimfAcHYY4WpmlP2qLwTJiQXe28i7dzCCZvYs1RVGbWVun1DS7imd03r7V8A/NuvdH0PcAye5l78pcQsVjM3hRTw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709315809; c=relaxed/simple; bh=VrL8Wgn7VCCPQmOga0aArrh/XkhN1vzXIcht0JUG/ec=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=OYBhq+Z3hd+2L0qwgXdCAIPUCGXw/ju6kzqnuOdnQj+WPGae4qptjlBdoT7VYHGURwX6kHRvb6oPQpIcwt52tAgD30YVSDpf+p1Bn/EUnyz6P2ji3tH0C03P/O53/96bCUw16ljap4GEyqspsTpfkXfxrdCD3S854clXSwkS1BQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=nc9oRtRt; arc=none smtp.client-ip=198.175.65.15 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1709315808; x=1740851808; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=VrL8Wgn7VCCPQmOga0aArrh/XkhN1vzXIcht0JUG/ec=; b=nc9oRtRtLSdUwG9nGC3nMHDuukoKxVkVLW7cj4kUi+nK5DHRhpRjoXLX +Lf64mitBtwEKmdjQwHeM1r8WUKFY5wej99AKxl8bHr1pj9e+0zVpjl87 4AhfhGlxTVVuXeFKa3/f66oYKT1aHk08zQyDmVCHNynuAyxPHneGek4Lh 0zbgmJeNQLIuVbHNznuzv6LguV1cLuaR7NlZaZApus/VE+6u36VhiKJkA kVIYIj7Xz+N1vPj+aMk1/VSRa/O4uRJoSjiisqSEuEt6BNK+DJkdv70VB ESn3OTJ3cvPM/kqpIP2RfdmQ9HfI+PG5G9DGOXPZE0EeSEQX2px4TM1GF Q==; X-IronPort-AV: E=McAfee;i="6600,9927,11000"; a="7684223" X-IronPort-AV: E=Sophos;i="6.06,196,1705392000"; d="scan'208";a="7684223" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orvoesa107.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Mar 2024 09:56:45 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,11000"; a="937037839" X-IronPort-AV: E=Sophos;i="6.06,196,1705392000"; d="scan'208";a="937037839" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga001.fm.intel.com with ESMTP; 01 Mar 2024 09:56:43 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id D5BA91A5; Fri, 1 Mar 2024 19:56:42 +0200 (EET) From: Andy Shevchenko To: Andy Shevchenko , linux-kernel@vger.kernel.org Cc: Andrew Morton , Philipp Stanner Subject: [PATCH v3 1/2] devres: Switch to use dev_err_probe() for unification Date: Fri, 1 Mar 2024 19:55:36 +0200 Message-ID: <20240301175641.270020-2-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.43.0.rc1.1.gbec44491f096 In-Reply-To: <20240301175641.270020-1-andriy.shevchenko@linux.intel.com> References: <20240301175641.270020-1-andriy.shevchenko@linux.intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1792347576099996607 X-GMAIL-MSGID: 1792347576099996607 The devm_*() APIs are supposed to be called during the ->probe() stage. Many drivers (especially new ones) have switched to use dev_err_probe() for error messaging for the sake of unification. Let's do the same in the devres APIs. Reviewed-by: Philipp Stanner Signed-off-by: Andy Shevchenko --- lib/devres.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/lib/devres.c b/lib/devres.c index c44f104b58d5..f38e8297ad5a 100644 --- a/lib/devres.c +++ b/lib/devres.c @@ -125,12 +125,13 @@ __devm_ioremap_resource(struct device *dev, const struct resource *res, resource_size_t size; void __iomem *dest_ptr; char *pretty_name; + int ret; BUG_ON(!dev); if (!res || resource_type(res) != IORESOURCE_MEM) { - dev_err(dev, "invalid resource %pR\n", res); - return IOMEM_ERR_PTR(-EINVAL); + ret = dev_err_probe(dev, -EINVAL, "invalid resource %pR\n", res); + return IOMEM_ERR_PTR(ret); } if (type == DEVM_IOREMAP && res->flags & IORESOURCE_MEM_NONPOSTED) @@ -144,20 +145,20 @@ __devm_ioremap_resource(struct device *dev, const struct resource *res, else pretty_name = devm_kstrdup(dev, dev_name(dev), GFP_KERNEL); if (!pretty_name) { - dev_err(dev, "can't generate pretty name for resource %pR\n", res); - return IOMEM_ERR_PTR(-ENOMEM); + ret = dev_err_probe(dev, -ENOMEM, "can't generate pretty name for resource %pR\n", res); + return IOMEM_ERR_PTR(ret); } if (!devm_request_mem_region(dev, res->start, size, pretty_name)) { - dev_err(dev, "can't request region for resource %pR\n", res); - return IOMEM_ERR_PTR(-EBUSY); + ret = dev_err_probe(dev, -EBUSY, "can't request region for resource %pR\n", res); + return IOMEM_ERR_PTR(ret); } dest_ptr = __devm_ioremap(dev, res->start, size, type); if (!dest_ptr) { - dev_err(dev, "ioremap failed for resource %pR\n", res); devm_release_mem_region(dev, res->start, size); - dest_ptr = IOMEM_ERR_PTR(-ENOMEM); + ret = dev_err_probe(dev, -ENOMEM, "ioremap failed for resource %pR\n", res); + return IOMEM_ERR_PTR(ret); } return dest_ptr;