pxa2xx_spi: spi_bfin5xx: limit reaches -1 rather than 0
vi drivers/spi/pxa2xx_spi.c +919
vi drivers/spi/spi_bfin5xx.c +645
if (flush(drv_data) == 0) {
dev_err(&drv_data->pdev->dev, "pump_transfers: flush failed\n");
message->status = -EIO;
giveback(drv_data);
return;
}But with a postfix decrement limit reaches -1 rather than 0.
--- drivers/spi/pxa2xx_spi.c | 2 +- drivers/spi/spi_bfin5xx.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/spi/pxa2xx_spi.c +1 -1
@@ -185,7 +185,7 @@ static int flush(struct driver_data *drv_data)while (read_SSSR (reg) &SSSR_RNE ) {read_SSDR (reg); } - }while ((read_SSSR (reg) &SSSR_BSY ) && limit--); + }while ((read_SSSR (reg) &SSSR_BSY ) && --limit);write_SSSR (SSSR_ROR , reg);return limit;
drivers/spi/spi_bfin5xx.c +1 -1
@@ -162,7 +162,7 @@ static int flush(struct driver_data *drv_data)unsigned long limit = loops_per_jiffy <<1 ;/* wait for stop and clear stat */ -while (!(read_STAT (drv_data) &BIT_STAT_SPIF ) && limit--) +while (!(read_STAT (drv_data) &BIT_STAT_SPIF ) && --limit)cpu_relax ();write_STAT (drv_data,BIT_STAT_CLR );
------------------------------------------------------------------------------
Create and Deploy Rich Internet Apps outside the browser with Adobe(R)AIR(TM) software. With Adobe AIR, Ajax developers can use existing skills and code to build responsive, highly engaging applications that combine the power of local resources and data with the reach of the web. Download the Adobe AIR SDK and Ajax docs to start building applications today-http://p.sf.net/sfu/adobe-com
PATCH v2 1/1 pxa2xx_spi: spi_bfin5xx: limit reaches -1 rather than 0
vi drivers/spi/pxa2xx_spi.c +919
vi drivers/spi/spi_bfin5xx.c +645
if (flush(drv_data) == 0) {
dev_err(&drv_data->pdev->dev, "pump_transfers: flush failed\n");
message->status = -EIO;
giveback(drv_data);
return;
}and:
drivers/spi/pxa2xx_spi.c:515: if (wait_ssp_rx_stall(drv_data->ioaddr) == 0)drivers/spi/pxa2xx_spi.c:569: if (wait_ssp_rx_stall(drv_data->ioaddr) == 0)drivers/spi/pxa2xx_spi.c:695: if (!wait_ssp_rx_stall(reg))drivers/spi/pxa2xx_spi.c:511: if (wait_dma_channel_stop(drv_data->rx_channel) == 0)
But with a postfix decrement limit reaches -1 rather than 0.
---
Sorry, I didn't catch two the first time
drivers/spi/pxa2xx_spi.c | 6 +++--- drivers/spi/spi_bfin5xx.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/spi/pxa2xx_spi.c +3 -3
@@ -185,7 +185,7 @@ static int flush(struct driver_data *drv_data)while (read_SSSR (reg) &SSSR_RNE ) {read_SSDR (reg); } - }while ((read_SSSR (reg) &SSSR_BSY ) && limit--); + }while ((read_SSSR (reg) &SSSR_BSY ) && --limit);write_SSSR (SSSR_ROR , reg);return limit;
@@ -459,7 +459,7 @@ static int wait_ssp_rx_stall(void const __iomem *ioaddr) {unsigned long limit = loops_per_jiffy <<1 ; -while ((read_SSSR (ioaddr) &SSSR_BSY ) && limit--) +while ((read_SSSR (ioaddr) &SSSR_BSY ) && --limit)cpu_relax ();return limit;
@@ -469,7 +469,7 @@ static int wait_dma_channel_stop(int channel) {unsigned long limit = loops_per_jiffy <<1 ; -while (!(DCSR (channel) &DCSR_STOPSTATE ) && limit--) +while (!(DCSR (channel) &DCSR_STOPSTATE ) && --limit)cpu_relax ();return limit;
drivers/spi/spi_bfin5xx.c +1 -1
@@ -162,7 +162,7 @@ static int flush(struct driver_data *drv_data)unsigned long limit = loops_per_jiffy <<1 ;/* wait for stop and clear stat */ -while (!(read_STAT (drv_data) &BIT_STAT_SPIF ) && limit--) +while (!(read_STAT (drv_data) &BIT_STAT_SPIF ) && --limit)cpu_relax ();write_STAT (drv_data,BIT_STAT_CLR );
------------------------------------------------------------------------------
Create and Deploy Rich Internet Apps outside the browser with Adobe(R)AIR(TM) software. With Adobe AIR, Ajax developers can use existing skills and code to build responsive, highly engaging applications that combine the power of local resources and data with the reach of the web. Download the Adobe AIR SDK and Ajax docs to start building applications today-http://p.sf.net/sfu/adobe-com
David Brownell
Acked-byQuoted 10 lines · Roel Kluin
vi
drivers/spi/pxa2xx_spi.c+919
vidrivers/spi/spi_bfin5xx.c+645if (flush(drv_data) == 0) { dev_err(&drv_data->pdev->dev, "pump_transfers: flush failed\n"); message->status = -EIO; giveback(drv_data); return; }
Quoted 3 lines
But with a postfix decrement limit reaches -1 rather than 0.
Signed-off-by Roel Kluin <[email protected]>
Although, note that if the *actual* count mattered here, the correect patch would be to test "flush() < 0)" ... except when using a "do {...} while (--limit)" idiom.
Try the thought experiment of starting with "limit = 1"; not all of these patches of your would go through the loop even once. Fortunately in all these cases, the limit is an arbitrary "don't loop forever" thing.
Quoted 25 lines
--- drivers/spi/pxa2xx_spi.c | 2 +- drivers/spi/spi_bfin5xx.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)drivers/spi/pxa2xx_spi.c +1
-1@@ -185,7 +185,7 @@ static int flush(struct driver_data *drv_data)while (read_SSSR (reg) &SSSR_RNE ) {read_SSDR (reg); } - }while ((read_SSSR (reg) &SSSR_BSY ) && limit--); + }while ((read_SSSR (reg) &SSSR_BSY ) && --limit);write_SSSR (SSSR_ROR , reg);return limit;drivers/spi/spi_bfin5xx.c +0
-0
drivers/spi/spi_bfin5xx.c static int flush(struct driver_data *drv_data) · line 168
Quoted 8 lines
drivers/spi/spi_bfin5xx.c +1
-1@@ -162,7 +162,7 @@ static int flush(struct driver_data *drv_data)unsigned long limit = loops_per_jiffy <<1 ;/* wait for stop and clear stat */ -while (!(read_STAT (drv_data) &BIT_STAT_SPIF ) && limit--) +while (!(read_STAT (drv_data) &BIT_STAT_SPIF ) && --limit)cpu_relax ();write_STAT (drv_data,BIT_STAT_CLR );
------------------------------------------------------------------------------
Create and Deploy Rich Internet Apps outside the browser with Adobe(R)AIR(TM) software. With Adobe AIR, Ajax developers can use existing skills and code to build responsive, highly engaging applications that combine the power of local resources and data with the reach of the web. Download the Adobe AIR SDK and Ajax docs to start building applications today-http://p.sf.net/sfu/adobe-com
2009/2/8 David Brownell <david-b-yBeKhBN/[email protected]>:
Quoted 11 lines · Roel Kluin
Quoted 10 lines
vi
drivers/spi/pxa2xx_spi.c+919
vidrivers/spi/spi_bfin5xx.c+645if (flush(drv_data) == 0) { dev_err(&drv_data->pdev->dev, "pump_transfers: flush failed\n"); message->status = -EIO; giveback(drv_data); return; }
Quoted 5 lines
Quoted 3 lines
But with a postfix decrement limit reaches -1 rather than 0.
Signed-off-by Roel Kluin <[email protected]>Acked-by David Brownell <[email protected]>
could you please review the patch at http://lkml.org/lkml/2009/2/8/72
instead? I initially overlooked two similar issues in the same file.
Quoted 3 lines
Although, note that if the *actual* count mattered here, the correect patch would be to test "
flush()< 0)" ... except when using a "do {...} while (--limit)" idiom.
True. You can also increase the limit with 1 when changing post- to prefix for the while (--limit) {...} idiom.
------------------------------------------------------------------------------
Create and Deploy Rich Internet Apps outside the browser with Adobe(R)AIR(TM) software. With Adobe AIR, Ajax developers can use existing skills and code to build responsive, highly engaging applications that combine the power of local resources and data with the reach of the web. Download the Adobe AIR SDK and Ajax docs to start building applications today-http://p.sf.net/sfu/adobe-com