Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp528098ybt; Wed, 24 Jun 2020 05:16:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwIKJKKTOnzdQMz0ug+5yuEUuovLTV/cXYzkDxHyrwzVhCqAG+uWfTWOotRDx2YA4krZidD X-Received: by 2002:a17:906:16d3:: with SMTP id t19mr23845085ejd.297.1593001007517; Wed, 24 Jun 2020 05:16:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593001007; cv=none; d=google.com; s=arc-20160816; b=bKUVfmBiYnNT/l8NweDku/RNiBUDw8YfoD2L//I+DBY9T7XdTLaaEUzSHpzjuKqja3 GqbVx36eV7S6yCZiR3RNIcemtgzATWYYFy7GZmG0kjKeobdv+aDY660kilvXX7KSK3Xp cGNuf/xxEpeN+viSdbaJQoSBSPwjwMloMOmwZRTVF36G1oStbKqVeRUTsZ1IO1UMPsQ5 8NLo+2DBFyuwHHGXtSBN71U2Y6b4c7yJvn2YOskNT7TbrKT5CYqDYgp+cboUKJNYRmdP P9MIsFfpU+p47hkShkCzafAnumvCjDnJpmRrw54zeUsY2kBPx6tY9P3WhWOdUZluBp3d oTjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version; bh=y7yu4WkGImMdwZqD5nlzk3Gg+6uRsmowaSAKYfis8Ec=; b=u3VlKR62ng5q5harRPJHMQYpBpZrXEG/rRPb9PkhACusge+e7epsWRBjD9FU1Y6Ows Dl2xoovKISMChiQPIca9ipfMMnBnGcBKYx/trVnDif1izzy9GMpkRmDapEiXqZ18BJJr Na29tvOCq+SPYa+Ttn5QYKyz2WhDYKxhP8mEgNm7NpRwZeM1p28XUuQnuoJ0JaWMWtt6 fVhSnLhDLDD/+FHAQrf7tyGXqq7DeKamotSHgAHgiGzGYalSF43wG8wFjruuS1HQYl/8 iUol5inbqUKdZL9ZOMfVsn4Qilxqo+F3G/wQwlQjgG6GJ5AN9nmLQgqC+8cQYXzUNrDQ gGNQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id du14si8734771ejc.721.2020.06.24.05.16.23; Wed, 24 Jun 2020 05:16:47 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390348AbgFXMO0 (ORCPT + 99 others); Wed, 24 Jun 2020 08:14:26 -0400 Received: from mail-ot1-f66.google.com ([209.85.210.66]:44774 "EHLO mail-ot1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389907AbgFXMOZ (ORCPT ); Wed, 24 Jun 2020 08:14:25 -0400 Received: by mail-ot1-f66.google.com with SMTP id e5so1650190ote.11 for ; Wed, 24 Jun 2020 05:14:24 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=y7yu4WkGImMdwZqD5nlzk3Gg+6uRsmowaSAKYfis8Ec=; b=cTTIucy5irZvRDjtg+nb4YFXoS7Dt1Y+XV3QgnDsmuJtBjjnGxzBl0kHE20/Y5XuYv FjtS9Eoz8q2ydC0bhfY+swiQwYnPNpexdlH3yqYHW+uDmlWpD47kVEaR5Q/3TyV+8XdH yjcknkvb8Xu692Y/TZlVtPmKdy08sfTlvDy3B+E9fSzsGBQ2erwPiYdaM4AscWi+t0v1 HRCWl09FYOGH4gaO1REw7nkHyjVCtgGS0aIuD2ebQKGyhAqph3XQEO67dsief9/vEtbD eehMl+TQCJdpA3hGX9WKY6Hsr7cAJXCcxsLwxLDbzpYKSm5H8VrpRuaz4IsKzlU0N/0/ SWtg== X-Gm-Message-State: AOAM532GIls34U+eNNq1fr/BYSTtsv4tz6Y2KtL560nLJHYVGqzL5bdh kvatxEvs5GofdNhSPB9xjaMZy/T7s4xidgsIyA4= X-Received: by 2002:a05:6830:10ca:: with SMTP id z10mr21642271oto.167.1593000864131; Wed, 24 Jun 2020 05:14:24 -0700 (PDT) MIME-Version: 1.0 References: <20200624114127.3016-1-a.hajda@samsung.com> <20200624114127.3016-4-a.hajda@samsung.com> In-Reply-To: <20200624114127.3016-4-a.hajda@samsung.com> From: "Rafael J. Wysocki" Date: Wed, 24 Jun 2020 14:14:11 +0200 Message-ID: Subject: Re: [RESEND PATCH v5 3/5] drivers core: allow probe_err accept integer and pointer types To: Andrzej Hajda Cc: Greg Kroah-Hartman , Bartlomiej Zolnierkiewicz , Marek Szyprowski , "Rafael J. Wysocki" , Linux Kernel Mailing List , Linux ARM , Andy Shevchenko , Mark Brown , Russell King - ARM Linux , Neil Armstrong , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , Daniel Vetter , "open list:DRM DRIVERS" Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Jun 24, 2020 at 1:41 PM Andrzej Hajda wrote: > > Many resource acquisition functions return error value encapsulated in > pointer instead of integer value. To simplify coding we can use macro > which will accept both types of error. > With this patch user can use: > probe_err(dev, ptr, ...) > instead of: > probe_err(dev, PTR_ERR(ptr), ...) > Without loosing old functionality: > probe_err(dev, err, ...) > > Signed-off-by: Andrzej Hajda The separation of this change from patch [1/5] looks kind of artificial to me. You are introducing a new function anyway, so why not to make it what you want right away? > --- > drivers/base/core.c | 25 ++----------------------- > include/linux/device.h | 25 ++++++++++++++++++++++++- > 2 files changed, 26 insertions(+), 24 deletions(-) > > diff --git a/drivers/base/core.c b/drivers/base/core.c > index 2a96954d5460..df283c62d9c0 100644 > --- a/drivers/base/core.c > +++ b/drivers/base/core.c > @@ -3953,28 +3953,7 @@ define_dev_printk_level(_dev_info, KERN_INFO); > > #endif > > -/** > - * probe_err - probe error check and log helper > - * @dev: the pointer to the struct device > - * @err: error value to test > - * @fmt: printf-style format string > - * @...: arguments as specified in the format string > - * > - * This helper implements common pattern present in probe functions for error > - * checking: print message if the error is not -EPROBE_DEFER and propagate it. > - * In case of -EPROBE_DEFER it sets defer probe reason, which can be checked > - * later by reading devices_deferred debugfs attribute. > - * It replaces code sequence: > - * if (err != -EPROBE_DEFER) > - * dev_err(dev, ...); > - * return err; > - * with > - * return probe_err(dev, err, ...); > - * > - * Returns @err. > - * > - */ > -int probe_err(const struct device *dev, int err, const char *fmt, ...) > +int __probe_err(const struct device *dev, int err, const char *fmt, ...) > { > struct va_format vaf; > va_list args; > @@ -3992,7 +3971,7 @@ int probe_err(const struct device *dev, int err, const char *fmt, ...) > > return err; > } > -EXPORT_SYMBOL_GPL(probe_err); > +EXPORT_SYMBOL_GPL(__probe_err); > > static inline bool fwnode_is_primary(struct fwnode_handle *fwnode) > { > diff --git a/include/linux/device.h b/include/linux/device.h > index 40a90d9bf799..22d3c3d4f461 100644 > --- a/include/linux/device.h > +++ b/include/linux/device.h > @@ -965,7 +965,30 @@ void device_links_supplier_sync_state_pause(void); > void device_links_supplier_sync_state_resume(void); > > extern __printf(3, 4) > -int probe_err(const struct device *dev, int err, const char *fmt, ...); > +int __probe_err(const struct device *dev, int err, const char *fmt, ...); > + > +/** > + * probe_err - probe error check and log helper > + * @dev: the pointer to the struct device > + * @err: error value to test, can be integer or pointer type > + * @fmt: printf-style format string > + * @...: arguments as specified in the format string > + * > + * This helper implements common pattern present in probe functions for error > + * checking: print message if the error is not -EPROBE_DEFER and propagate it. > + * In case of -EPROBE_DEFER it sets defer probe reason, which can be checked > + * later by reading devices_deferred debugfs attribute. > + * It replaces code sequence: > + * if (err != -EPROBE_DEFER) > + * dev_err(dev, ...); > + * return err; > + * with > + * return probe_err(dev, err, ...); > + * > + * Returns @err. > + * > + */ > +#define probe_err(dev, err, args...) __probe_err(dev, (long)(err), args) > > /* Create alias, so I can be autoloaded. */ > #define MODULE_ALIAS_CHARDEV(major,minor) \ > -- > 2.17.1 >