Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp539124ybt; Wed, 24 Jun 2020 05:32:17 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxy8sWCYRE/tEn0+hMHQy/OHgvFyujPWkDHWhnwn+I89FQ77QC84QNgj/WOhqY0GbmhTk40 X-Received: by 2002:a50:8467:: with SMTP id 94mr26201573edp.249.1593001937673; Wed, 24 Jun 2020 05:32:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593001937; cv=none; d=google.com; s=arc-20160816; b=TKMbg4cYzWydfsvCD4de2+qN3BfyVDN9FvJq3q5w2sROFevWQ6HRSONc62IVfT39FY fSETHFRQ6VcdmGy+L9zCdlpqik/c+x0yL1M9gzzGgub4StYa1ThtwG/I6dlxeGQkKYF4 HHkRfsu3pt33+f1t2tJ7nZdMGUjbyS3EipE8Jurb4XLKrKUCImtK+qR/hx2ykH3rQayg O0bhVGamDYDZuOvDhwyClRHFGlJ7NFwmUWTjHwOU74SskdDfhtYF3n77s7XVwbERfKQ+ rU6k0ptz819y2PiQsQJTHWgZrG1wVRbFdz1xFZzn+NBzqMPDaS8mblm1jr8pnfnGrm5d inLQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:in-reply-to:content-disposition :mime-version:references:message-id:subject:cc:to:from:date :dkim-signature; bh=E3mhX6be1uSb+g6NrNnA3Gy63b/nxubO3nWjscgOYBk=; b=xmI+6QO9/9LGOFh5r363h/eA2NjQWNmMpQQzGFG16HwH9FwEeT9FJ5VDqIh5f1JCov 6bJShFthQGpRrVGuebLjyExo9+B0x4RiPbUMx06ECWjUbeprV0N0SgiNUKBtwtyds6hq c8DOcNpafP4hsJFN2GnhJqaOy3bVeCAzpawBd58T5UWN+fnB9IJklpcUkwuumVzflA62 s26LN1wG/rrVyn0XJFcadLOk+bYU7gnJWAfGU9PGWQs94x65aCdiKOY8FHP0fx5cjQSr YQtaAdIvc2brwMRWQoGHlLQ/8oSwME1uvTDZx3NTPpgavuUTzp8SsxH5g9fINq7ygXzp n20w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="NLDoURA/"; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id f22si2503188edw.472.2020.06.24.05.31.53; Wed, 24 Jun 2020 05:32:17 -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; dkim=pass header.i=@kernel.org header.s=default header.b="NLDoURA/"; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390552AbgFXMaN (ORCPT + 99 others); Wed, 24 Jun 2020 08:30:13 -0400 Received: from mail.kernel.org ([198.145.29.99]:35794 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388790AbgFXMaN (ORCPT ); Wed, 24 Jun 2020 08:30:13 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 2250820707; Wed, 24 Jun 2020 12:30:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1593001811; bh=HlA6luu4r6/yFqJBEksA5pntocBrVJtjQggo8uE7V0w=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=NLDoURA/Gn5X4R0JA1WB+sDEtFPFY6RMrIYYtzI6+p20500eW6YGrD95nff0+Atb4 Bf/596jKYcvwaopyzU6z+xyJMHjuS0q2gVnPfPEWbO0QQ7fQ2P7ArAW/Lszfn1uNeY TfjK+yTMTXr6Ep9Y6Ml98NDBB/d/eNHz9nnaKy4Q= Date: Wed, 24 Jun 2020 14:30:08 +0200 From: Greg Kroah-Hartman To: Andrzej Hajda Cc: Bartlomiej Zolnierkiewicz , Marek Szyprowski , "Rafael J. Wysocki" , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, andy.shevchenko@gmail.com, Mark Brown , Russell King - ARM Linux , Neil Armstrong , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , Daniel Vetter , "open list:DRM DRIVERS" Subject: Re: [RESEND PATCH v5 3/5] drivers core: allow probe_err accept integer and pointer types Message-ID: <20200624123008.GA1773782@kroah.com> References: <20200624114127.3016-1-a.hajda@samsung.com> <20200624114127.3016-4-a.hajda@samsung.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200624114127.3016-4-a.hajda@samsung.com> 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 01:41:25PM +0200, 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 > --- > 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) Shouldn't that be "unsigned long" instead of "long"? That's what we put pointers in last I looked... thanks, greg k-h