* [patch] spi: bcm63xx-hsspi: checking for ERR_PTR instead of NULL
@ 2013-12-06 12:58 Dan Carpenter
[not found] ` <20131206125823.GA32369-mgFCXtclrQlZLf2FXnZxJA@public.gmane.org>
0 siblings, 1 reply; 6+ messages in thread
From: Dan Carpenter @ 2013-12-06 12:58 UTC (permalink / raw)
To: Mark Brown, Jonas Gorski; +Cc: linux-spi, kernel-janitors
devm_request_and_ioremap() returns NULL on error, it doesn't return an
ERR_PTR().
Fixes: 142168eba9dc ('spi: bcm63xx-hsspi: add bcm63xx HSSPI driver')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
diff --git a/drivers/spi/spi-bcm63xx-hsspi.c b/drivers/spi/spi-bcm63xx-hsspi.c
index bc8d848d33b7..da9f85d55c81 100644
--- a/drivers/spi/spi-bcm63xx-hsspi.c
+++ b/drivers/spi/spi-bcm63xx-hsspi.c
@@ -339,8 +339,8 @@ static int bcm63xx_hsspi_probe(struct platform_device *pdev)
res_mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
regs = devm_request_and_ioremap(dev, res_mem);
- if (IS_ERR(regs))
- return PTR_ERR(regs);
+ if (!regs)
+ return -EADDRNOTAVAIL;
clk = clk_get(dev, "hsspi");
^ permalink raw reply related [flat|nested] 6+ messages in thread[parent not found: <20131206125823.GA32369-mgFCXtclrQlZLf2FXnZxJA@public.gmane.org>]
* Re: [patch] spi: bcm63xx-hsspi: checking for ERR_PTR instead of NULL [not found] ` <20131206125823.GA32369-mgFCXtclrQlZLf2FXnZxJA@public.gmane.org> @ 2013-12-06 13:08 ` Jonas Gorski 2013-12-06 13:34 ` Dan Carpenter [not found] ` <CAOiHx=k87c_bFqFtJ7zJc9HxnjOEr2oMofNUsLkQbfQPrC04hQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 0 siblings, 2 replies; 6+ messages in thread From: Jonas Gorski @ 2013-12-06 13:08 UTC (permalink / raw) To: Dan Carpenter Cc: Mark Brown, linux-spi-u79uwXL29TY76Z2rM5mHXA, kernel-janitors-u79uwXL29TY76Z2rM5mHXA On Fri, Dec 6, 2013 at 1:58 PM, Dan Carpenter <dan.carpenter-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org> wrote: > devm_request_and_ioremap() returns NULL on error, it doesn't return an > ERR_PTR(). > > Fixes: 142168eba9dc ('spi: bcm63xx-hsspi: add bcm63xx HSSPI driver') > Signed-off-by: Dan Carpenter <dan.carpenter-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org> > > diff --git a/drivers/spi/spi-bcm63xx-hsspi.c b/drivers/spi/spi-bcm63xx-hsspi.c > index bc8d848d33b7..da9f85d55c81 100644 > --- a/drivers/spi/spi-bcm63xx-hsspi.c > +++ b/drivers/spi/spi-bcm63xx-hsspi.c > @@ -339,8 +339,8 @@ static int bcm63xx_hsspi_probe(struct platform_device *pdev) > > res_mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); > regs = devm_request_and_ioremap(dev, res_mem); > - if (IS_ERR(regs)) > - return PTR_ERR(regs); > + if (!regs) > + return -EADDRNOTAVAIL; Instead of fixing the wrong handling of the return value, let's change it to use devm_ioremap_resource() which actually returns the expected ERR_PTR() and is preferred over request_and_ioremap(). Regards Jonas -- To unsubscribe from this list: send the line "unsubscribe linux-spi" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [patch] spi: bcm63xx-hsspi: checking for ERR_PTR instead of NULL 2013-12-06 13:08 ` Jonas Gorski @ 2013-12-06 13:34 ` Dan Carpenter [not found] ` <CAOiHx=k87c_bFqFtJ7zJc9HxnjOEr2oMofNUsLkQbfQPrC04hQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 1 sibling, 0 replies; 6+ messages in thread From: Dan Carpenter @ 2013-12-06 13:34 UTC (permalink / raw) To: Jonas Gorski; +Cc: Mark Brown, linux-spi, kernel-janitors On Fri, Dec 06, 2013 at 02:08:08PM +0100, Jonas Gorski wrote: > On Fri, Dec 6, 2013 at 1:58 PM, Dan Carpenter <dan.carpenter@oracle.com> wrote: > > devm_request_and_ioremap() returns NULL on error, it doesn't return an > > ERR_PTR(). > > > > Fixes: 142168eba9dc ('spi: bcm63xx-hsspi: add bcm63xx HSSPI driver') > > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> > > > > diff --git a/drivers/spi/spi-bcm63xx-hsspi.c b/drivers/spi/spi-bcm63xx-hsspi.c > > index bc8d848d33b7..da9f85d55c81 100644 > > --- a/drivers/spi/spi-bcm63xx-hsspi.c > > +++ b/drivers/spi/spi-bcm63xx-hsspi.c > > @@ -339,8 +339,8 @@ static int bcm63xx_hsspi_probe(struct platform_device *pdev) > > > > res_mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); > > regs = devm_request_and_ioremap(dev, res_mem); > > - if (IS_ERR(regs)) > > - return PTR_ERR(regs); > > + if (!regs) > > + return -EADDRNOTAVAIL; > > Instead of fixing the wrong handling of the return value, let's change > it to use devm_ioremap_resource() which actually returns the expected > ERR_PTR() and is preferred over request_and_ioremap(). > Sure. I'll resend a v2. regards, dan carpenter ^ permalink raw reply [flat|nested] 6+ messages in thread
[parent not found: <CAOiHx=k87c_bFqFtJ7zJc9HxnjOEr2oMofNUsLkQbfQPrC04hQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>]
* [patch v2] spi: bcm63xx-hsspi: checking for ERR_PTR instead of NULL [not found] ` <CAOiHx=k87c_bFqFtJ7zJc9HxnjOEr2oMofNUsLkQbfQPrC04hQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> @ 2013-12-06 14:12 ` Dan Carpenter [not found] ` <20131206141212.GA956-mgFCXtclrQlZLf2FXnZxJA@public.gmane.org> 2013-12-09 17:24 ` Mark Brown 0 siblings, 2 replies; 6+ messages in thread From: Dan Carpenter @ 2013-12-06 14:12 UTC (permalink / raw) To: Mark Brown, Jonas Gorski Cc: linux-spi-u79uwXL29TY76Z2rM5mHXA, kernel-janitors-u79uwXL29TY76Z2rM5mHXA devm_request_and_ioremap() returns NULL on error, it doesn't return an ERR_PTR(). This patch fixes it by switching to devm_ioremap_resource() which is the prefered function anyway. Fixes: 142168eba9dc ('spi: bcm63xx-hsspi: add bcm63xx HSSPI driver') Signed-off-by: Dan Carpenter <dan.carpenter-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org> --- v2: switch to devm_ioremap_resource() diff --git a/drivers/spi/spi-bcm63xx-hsspi.c b/drivers/spi/spi-bcm63xx-hsspi.c index bc8d848d33b7..2cfe8eb619fd 100644 --- a/drivers/spi/spi-bcm63xx-hsspi.c +++ b/drivers/spi/spi-bcm63xx-hsspi.c @@ -338,7 +338,7 @@ static int bcm63xx_hsspi_probe(struct platform_device *pdev) } res_mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); - regs = devm_request_and_ioremap(dev, res_mem); + regs = devm_ioremap_resource(dev, res_mem); if (IS_ERR(regs)) return PTR_ERR(regs); -- To unsubscribe from this list: send the line "unsubscribe linux-spi" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply related [flat|nested] 6+ messages in thread
[parent not found: <20131206141212.GA956-mgFCXtclrQlZLf2FXnZxJA@public.gmane.org>]
* Re: [patch v2] spi: bcm63xx-hsspi: checking for ERR_PTR instead of NULL [not found] ` <20131206141212.GA956-mgFCXtclrQlZLf2FXnZxJA@public.gmane.org> @ 2013-12-06 14:48 ` Jonas Gorski 0 siblings, 0 replies; 6+ messages in thread From: Jonas Gorski @ 2013-12-06 14:48 UTC (permalink / raw) To: Dan Carpenter Cc: Mark Brown, linux-spi-u79uwXL29TY76Z2rM5mHXA, kernel-janitors-u79uwXL29TY76Z2rM5mHXA On Fri, Dec 6, 2013 at 3:12 PM, Dan Carpenter <dan.carpenter-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org> wrote: > devm_request_and_ioremap() returns NULL on error, it doesn't return an > ERR_PTR(). This patch fixes it by switching to devm_ioremap_resource() > which is the prefered function anyway. > > Fixes: 142168eba9dc ('spi: bcm63xx-hsspi: add bcm63xx HSSPI driver') > Signed-off-by: Dan Carpenter <dan.carpenter-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org> Thanks. Acked-by: Jonas Gorski <jogo-p3rKhJxN3npAfugRpC6u6w@public.gmane.org> Jonas > --- > v2: switch to devm_ioremap_resource() > > diff --git a/drivers/spi/spi-bcm63xx-hsspi.c b/drivers/spi/spi-bcm63xx-hsspi.c > index bc8d848d33b7..2cfe8eb619fd 100644 > --- a/drivers/spi/spi-bcm63xx-hsspi.c > +++ b/drivers/spi/spi-bcm63xx-hsspi.c > @@ -338,7 +338,7 @@ static int bcm63xx_hsspi_probe(struct platform_device *pdev) > } > > res_mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); > - regs = devm_request_and_ioremap(dev, res_mem); > + regs = devm_ioremap_resource(dev, res_mem); > if (IS_ERR(regs)) > return PTR_ERR(regs); > > -- > To unsubscribe from this list: send the line "unsubscribe linux-spi" in > the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-spi" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [patch v2] spi: bcm63xx-hsspi: checking for ERR_PTR instead of NULL 2013-12-06 14:12 ` [patch v2] " Dan Carpenter [not found] ` <20131206141212.GA956-mgFCXtclrQlZLf2FXnZxJA@public.gmane.org> @ 2013-12-09 17:24 ` Mark Brown 1 sibling, 0 replies; 6+ messages in thread From: Mark Brown @ 2013-12-09 17:24 UTC (permalink / raw) To: Dan Carpenter; +Cc: Jonas Gorski, linux-spi, kernel-janitors [-- Attachment #1: Type: text/plain, Size: 269 bytes --] On Fri, Dec 06, 2013 at 05:12:13PM +0300, Dan Carpenter wrote: > devm_request_and_ioremap() returns NULL on error, it doesn't return an > ERR_PTR(). This patch fixes it by switching to devm_ioremap_resource() > which is the prefered function anyway. Applied, thanks. [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 836 bytes --] ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-12-09 17:24 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-12-06 12:58 [patch] spi: bcm63xx-hsspi: checking for ERR_PTR instead of NULL Dan Carpenter
[not found] ` <20131206125823.GA32369-mgFCXtclrQlZLf2FXnZxJA@public.gmane.org>
2013-12-06 13:08 ` Jonas Gorski
2013-12-06 13:34 ` Dan Carpenter
[not found] ` <CAOiHx=k87c_bFqFtJ7zJc9HxnjOEr2oMofNUsLkQbfQPrC04hQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2013-12-06 14:12 ` [patch v2] " Dan Carpenter
[not found] ` <20131206141212.GA956-mgFCXtclrQlZLf2FXnZxJA@public.gmane.org>
2013-12-06 14:48 ` Jonas Gorski
2013-12-09 17:24 ` Mark Brown
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).