Skip to content

Commit

Permalink
spi: Use reinit_completion at appropriate places
Browse files Browse the repository at this point in the history
Calling init_completion() once is enough.
For the rest of the iterations, call reinit_completion() instead.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
  • Loading branch information
Axel Lin authored and Mark Brown committed Feb 10, 2014
1 parent 38dbfb5 commit aa0fe82
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 4 deletions.
3 changes: 2 additions & 1 deletion drivers/spi/spi-bcm63xx-hsspi.c
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ static int bcm63xx_hsspi_do_txrx(struct spi_device *spi, struct spi_transfer *t)
while (pending > 0) {
int curr_step = min_t(int, step_size, pending);

init_completion(&bs->done);
reinit_completion(&bs->done);
if (tx) {
memcpy_toio(bs->fifo + HSSPI_OPCODE_LEN, tx, curr_step);
tx += curr_step;
Expand Down Expand Up @@ -369,6 +369,7 @@ static int bcm63xx_hsspi_probe(struct platform_device *pdev)
bs->fifo = (u8 __iomem *)(bs->regs + HSSPI_FIFO_REG(0));

mutex_init(&bs->bus_mutex);
init_completion(&bs->done);

master->bus_num = HSSPI_BUS_NUM;
master->num_chipselect = 8;
Expand Down
3 changes: 2 additions & 1 deletion drivers/spi/spi-bcm63xx.c
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ static int bcm63xx_txrx_bufs(struct spi_device *spi, struct spi_transfer *first,
transfer_list);
}

init_completion(&bs->done);
reinit_completion(&bs->done);

/* Fill in the Message control register */
msg_ctl = (len << SPI_BYTE_CNT_SHIFT);
Expand Down Expand Up @@ -353,6 +353,7 @@ static int bcm63xx_spi_probe(struct platform_device *pdev)
}

bs = spi_master_get_devdata(master);
init_completion(&bs->done);

platform_set_drvdata(pdev, master);
bs->pdev = pdev;
Expand Down
3 changes: 2 additions & 1 deletion drivers/spi/spi-efm32.c
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ static int efm32_spi_txrx_bufs(struct spi_device *spi, struct spi_transfer *t)

efm32_spi_filltx(ddata);

init_completion(&ddata->done);
reinit_completion(&ddata->done);

efm32_spi_write32(ddata, REG_IF_TXBL | REG_IF_RXDATAV, REG_IEN);

Expand Down Expand Up @@ -349,6 +349,7 @@ static int efm32_spi_probe(struct platform_device *pdev)
ddata->bitbang.txrx_bufs = efm32_spi_txrx_bufs;

spin_lock_init(&ddata->lock);
init_completion(&ddata->done);

ddata->clk = devm_clk_get(&pdev->dev, NULL);
if (IS_ERR(ddata->clk)) {
Expand Down
2 changes: 1 addition & 1 deletion drivers/spi/spi-imx.c
Original file line number Diff line number Diff line change
Expand Up @@ -741,7 +741,7 @@ static int spi_imx_transfer(struct spi_device *spi,
spi_imx->count = transfer->len;
spi_imx->txfifo = 0;

init_completion(&spi_imx->xfer_done);
reinit_completion(&spi_imx->xfer_done);

spi_imx_push(spi_imx);

Expand Down

0 comments on commit aa0fe82

Please sign in to comment.