* [PATCH 0/2] change PTR_ERR argument @ 2015-08-30 18:05 Julia Lawall 2015-08-30 18:05 ` [PATCH 2/2] spi: spi-ep93xx: " Julia Lawall 0 siblings, 1 reply; 4+ messages in thread From: Julia Lawall @ 2015-08-30 18:05 UTC (permalink / raw) To: alsa-devel; +Cc: Mark Brown, kernel-janitors, linux-kernel, linux-spi Apply PTR_ERR to the value that was recently assigned. --- var/julia/linuxcopy/drivers/spi/spi-ep93xx.c | 3 ++- var/julia/linuxcopy/sound/soc/qcom/lpass-cpu.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) ^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 2/2] spi: spi-ep93xx: change PTR_ERR argument 2015-08-30 18:05 [PATCH 0/2] change PTR_ERR argument Julia Lawall @ 2015-08-30 18:05 ` Julia Lawall 2015-08-30 18:31 ` walter harms 0 siblings, 1 reply; 4+ messages in thread From: Julia Lawall @ 2015-08-30 18:05 UTC (permalink / raw) To: Mark Brown; +Cc: kernel-janitors, linux-spi, linux-kernel Apply PTR_ERR to the value that was recently assigned. The semantic match that finds this problem is as follows: (http://coccinelle.lip6.fr/) // <smpl> @@ expression x,y; @@ if (IS_ERR(x) || ...) { ... when any when != IS_ERR(...) ( PTR_ERR(x) | * PTR_ERR(y) ) ... when any } // </smpl> Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr> --- drivers/spi/spi-ep93xx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/spi/spi-ep93xx.c b/drivers/spi/spi-ep93xx.c index bb00be8..1a7696c 100644 --- a/drivers/spi/spi-ep93xx.c +++ b/drivers/spi/spi-ep93xx.c @@ -567,7 +567,8 @@ static void ep93xx_spi_dma_transfer(struct ep93xx_spi *espi) txd = ep93xx_spi_dma_prepare(espi, DMA_MEM_TO_DEV); if (IS_ERR(txd)) { ep93xx_spi_dma_finish(espi, DMA_DEV_TO_MEM); - dev_err(&espi->pdev->dev, "DMA TX failed: %ld\n", PTR_ERR(rxd)); + dev_err(&espi->pdev->dev, "DMA TX failed: %ld\n", + PTR_ERR(txd)); msg->status = PTR_ERR(txd); return; } ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 2/2] spi: spi-ep93xx: change PTR_ERR argument 2015-08-30 18:05 ` [PATCH 2/2] spi: spi-ep93xx: " Julia Lawall @ 2015-08-30 18:31 ` walter harms 2015-08-30 20:10 ` [PATCH 2/2 v2] spi: spi-ep93xx: fix PTR_ERR problem Julia Lawall 0 siblings, 1 reply; 4+ messages in thread From: walter harms @ 2015-08-30 18:31 UTC (permalink / raw) To: Julia Lawall; +Cc: Mark Brown, kernel-janitors, linux-spi, linux-kernel Am 30.08.2015 20:05, schrieb Julia Lawall: > Apply PTR_ERR to the value that was recently assigned. > > The semantic match that finds this problem is as follows: > (http://coccinelle.lip6.fr/) > > // <smpl> > @@ > expression x,y; > @@ > > if (IS_ERR(x) || ...) { > ... when any > when != IS_ERR(...) > ( > PTR_ERR(x) > | > * PTR_ERR(y) > ) > ... when any > } > // </smpl> > > Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr> > > --- > drivers/spi/spi-ep93xx.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/spi/spi-ep93xx.c b/drivers/spi/spi-ep93xx.c > index bb00be8..1a7696c 100644 > --- a/drivers/spi/spi-ep93xx.c > +++ b/drivers/spi/spi-ep93xx.c > @@ -567,7 +567,8 @@ static void ep93xx_spi_dma_transfer(struct ep93xx_spi *espi) > txd = ep93xx_spi_dma_prepare(espi, DMA_MEM_TO_DEV); > if (IS_ERR(txd)) { > ep93xx_spi_dma_finish(espi, DMA_DEV_TO_MEM); > - dev_err(&espi->pdev->dev, "DMA TX failed: %ld\n", PTR_ERR(rxd)); > + dev_err(&espi->pdev->dev, "DMA TX failed: %ld\n", > + PTR_ERR(txd)); > msg->status = PTR_ERR(txd); > return; > } > I improve readability i would suggest: ep93xx_spi_dma_finish(espi, DMA_DEV_TO_MEM); msg->status = PTR_ERR(txd); dev_err(&espi->pdev->dev, "DMA TX failed: %ld\n",msg->status): return; just my 2 cents, re, wh > -- > To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > ^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 2/2 v2] spi: spi-ep93xx: fix PTR_ERR problem 2015-08-30 18:31 ` walter harms @ 2015-08-30 20:10 ` Julia Lawall 0 siblings, 0 replies; 4+ messages in thread From: Julia Lawall @ 2015-08-30 20:10 UTC (permalink / raw) To: walter harms; +Cc: Mark Brown, kernel-janitors, linux-spi, linux-kernel Move initialization of msg->status up over the call to dev_err, in both calls to ep93xx_spi_dma_prepare, and change the reference in the call to dev_err to msg->status, to both fix the wrong argument to PTR_ERR in the second case and to make the dev_err line a little shorter. This required furthermore replacing %ld by %d, since msg->status is an integer. The semantic match that finds the PTR_ERR problem is as follows: (http://coccinelle.lip6.fr/) // <smpl> @@ expression x,y; @@ if (IS_ERR(x) || ...) { ... when any when != IS_ERR(...) ( PTR_ERR(x) | * PTR_ERR(y) ) ... when any } // </smpl> Reorganizations at the suggestion of Walter Harms. Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr> --- v2: Reorganize the code, to solve the problem in a way that makes the resulting code simpler. drivers/spi/spi-ep93xx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/spi/spi-ep93xx.c b/drivers/spi/spi-ep93xx.c index bb00be8..73d0df6 100644 --- a/drivers/spi/spi-ep93xx.c +++ b/drivers/spi/spi-ep93xx.c @@ -559,16 +559,16 @@ static void ep93xx_spi_dma_transfer(struct ep93xx_spi *espi) rxd = ep93xx_spi_dma_prepare(espi, DMA_DEV_TO_MEM); if (IS_ERR(rxd)) { - dev_err(&espi->pdev->dev, "DMA RX failed: %ld\n", PTR_ERR(rxd)); msg->status = PTR_ERR(rxd); + dev_err(&espi->pdev->dev, "DMA RX failed: %d\n", msg->status); return; } txd = ep93xx_spi_dma_prepare(espi, DMA_MEM_TO_DEV); if (IS_ERR(txd)) { ep93xx_spi_dma_finish(espi, DMA_DEV_TO_MEM); - dev_err(&espi->pdev->dev, "DMA TX failed: %ld\n", PTR_ERR(rxd)); msg->status = PTR_ERR(txd); + dev_err(&espi->pdev->dev, "DMA TX failed: %d\n", msg->status); return; } ^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-08-30 20:10 UTC | newest] Thread overview: 4+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2015-08-30 18:05 [PATCH 0/2] change PTR_ERR argument Julia Lawall 2015-08-30 18:05 ` [PATCH 2/2] spi: spi-ep93xx: " Julia Lawall 2015-08-30 18:31 ` walter harms 2015-08-30 20:10 ` [PATCH 2/2 v2] spi: spi-ep93xx: fix PTR_ERR problem Julia Lawall
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).