From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from 11.mo4.mail-out.ovh.net ([46.105.34.195]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Y8het-0000Q3-7Y for barebox@lists.infradead.org; Wed, 07 Jan 2015 03:51:48 +0000 Received: from mail194.ha.ovh.net (gw6.ovh.net [213.251.189.206]) by mo4.mail-out.ovh.net (Postfix) with SMTP id 93425FFA1D1 for ; Wed, 7 Jan 2015 04:51:21 +0100 (CET) Mime-Version: 1.0 (Mac OS X Mail 8.1 \(1993\)) From: Jean-Christophe PLAGNIOL-VILLARD In-Reply-To: <20150106124423.GB17225@pengutronix.de> Date: Wed, 7 Jan 2015 11:14:32 +0800 Message-Id: <14050F68-52D5-42C2-9E0B-D396D6817EB9@jcrosoft.com> References: <20150106113227.GC4563@ns203013.ovh.net> <1420544226-30497-1-git-send-email-plagnioj@jcrosoft.com> <1420544226-30497-2-git-send-email-plagnioj@jcrosoft.com> <20150106124423.GB17225@pengutronix.de> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "barebox" Errors-To: barebox-bounces+u.kleine-koenig=pengutronix.de@lists.infradead.org Subject: Re: [PATCH 2/2] driver: workarroud resource request that conflist with errno PTR To: Sascha Hauer Cc: barebox@lists.infradead.org > On Jan 6, 2015, at 8:44 PM, Sascha Hauer wrote: > > On Tue, Jan 06, 2015 at 12:37:06PM +0100, Jean-Christophe PLAGNIOL-VILLARD wrote: >> broken since >> >> commit ed6e965824303255cacc1c1a195d3684caa26bce >> Author: Sascha Hauer >> resource: Let dev_request_mem_region return an error pointer >> >> Introduce dev_request_mem_region_err_null >> >> only used on platform like at91 where the Ressource address collision with >> >> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD >> --- >> arch/arm/mach-at91/at91sam926x_time.c | 6 +++--- >> drivers/base/driver.c | 31 +++++++++++++++++++++++++++++-- >> drivers/pinctrl/pinctrl-at91.c | 6 +++--- >> drivers/serial/atmel.c | 6 +++--- >> include/driver.h | 8 ++++++++ >> 5 files changed, 46 insertions(+), 11 deletions(-) >> >> diff --git a/arch/arm/mach-at91/at91sam926x_time.c b/arch/arm/mach-at91/at91sam926x_time.c >> index 789e1ec..cc7ad2f 100644 >> --- a/arch/arm/mach-at91/at91sam926x_time.c >> +++ b/arch/arm/mach-at91/at91sam926x_time.c >> @@ -89,9 +89,9 @@ static int at91_pit_probe(struct device_d *dev) >> return ret; >> } >> >> - pit_base = dev_request_mem_region(dev, 0); >> - if (IS_ERR(pit_base)) >> - return PTR_ERR(pit_base); >> + pit_base = dev_request_mem_region_err_null(dev, 0); >> + if (!pit_base) >> + return -ENOENT; >> >> pit_rate = clk_get_rate(clk) / 16; >> >> diff --git a/drivers/base/driver.c b/drivers/base/driver.c >> index e0125a1..2375004 100644 >> --- a/drivers/base/driver.c >> +++ b/drivers/base/driver.c >> @@ -242,8 +242,8 @@ int register_driver(struct driver_d *drv) >> } >> EXPORT_SYMBOL(register_driver); >> >> -struct resource *dev_get_resource(struct device_d *dev, unsigned long type, >> - int num) >> +static struct resource *__dev_get_resource(struct device_d *dev, >> + unsigned long type, int num) >> { >> int i, n = 0; >> >> @@ -256,6 +256,17 @@ struct resource *dev_get_resource(struct device_d *dev, unsigned long type, >> } >> } >> >> + return NULL; >> +} >> + >> +struct resource *dev_get_resource(struct device_d *dev, unsigned long type, >> + int num) >> +{ >> + struct resource *res = __dev_get_resource(dev, type, num); >> + >> + if (res) >> + return res; >> + >> return ERR_PTR(-ENOENT); >> } > > No need to change dev_get_resource(), it returns a struct resource * > which will never conflict with an err ptr. but as if no ressource is found it return ERR_PTR(-ENOENT) so it does conflict Best Regards, J. > > Sascha > > -- > Pengutronix e.K. | | > Industrial Linux Solutions | http://www.pengutronix.de/ | > Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | > Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox