diff options
author | Mark Brown <broonie@linaro.org> | 2013-06-26 11:21:05 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-06-26 11:21:05 -0400 |
commit | cf7315b21466f6a1de0bf9f032faef4ceb0483c3 (patch) | |
tree | b54208af110db346f461d4456efdcf417a8e3b8d | |
parent | adb25d5328bc2ca207a49f7b3dad3602a5cad351 (diff) | |
parent | f5d8ee3f15dd71837ca672c3743b1bca5a0c013a (diff) |
Merge remote-tracking branch 'spi/topic/topcliff' into spi-next
-rw-r--r-- | drivers/spi/spi-topcliff-pch.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/spi/spi-topcliff-pch.c b/drivers/spi/spi-topcliff-pch.c index a5099370aaee..dd55707a6aa5 100644 --- a/drivers/spi/spi-topcliff-pch.c +++ b/drivers/spi/spi-topcliff-pch.c | |||
@@ -367,7 +367,7 @@ static irqreturn_t pch_spi_handler(int irq, void *dev_id) | |||
367 | 367 | ||
368 | if (reg_spsr_val & SPSR_ORF_BIT) { | 368 | if (reg_spsr_val & SPSR_ORF_BIT) { |
369 | dev_err(&board_dat->pdev->dev, "%s Over run error\n", __func__); | 369 | dev_err(&board_dat->pdev->dev, "%s Over run error\n", __func__); |
370 | if (data->current_msg->complete != 0) { | 370 | if (data->current_msg->complete) { |
371 | data->transfer_complete = true; | 371 | data->transfer_complete = true; |
372 | data->current_msg->status = -EIO; | 372 | data->current_msg->status = -EIO; |
373 | data->current_msg->complete(data->current_msg->context); | 373 | data->current_msg->complete(data->current_msg->context); |
@@ -643,7 +643,7 @@ static void pch_spi_set_tx(struct pch_spi_data *data, int *bpw) | |||
643 | list_for_each_entry_safe(pmsg, tmp, data->queue.next, queue) { | 643 | list_for_each_entry_safe(pmsg, tmp, data->queue.next, queue) { |
644 | pmsg->status = -ENOMEM; | 644 | pmsg->status = -ENOMEM; |
645 | 645 | ||
646 | if (pmsg->complete != 0) | 646 | if (pmsg->complete) |
647 | pmsg->complete(pmsg->context); | 647 | pmsg->complete(pmsg->context); |
648 | 648 | ||
649 | /* delete from queue */ | 649 | /* delete from queue */ |
@@ -693,7 +693,7 @@ static void pch_spi_nomore_transfer(struct pch_spi_data *data) | |||
693 | * [To the spi core..indicating end of transfer] */ | 693 | * [To the spi core..indicating end of transfer] */ |
694 | data->current_msg->status = 0; | 694 | data->current_msg->status = 0; |
695 | 695 | ||
696 | if (data->current_msg->complete != 0) { | 696 | if (data->current_msg->complete) { |
697 | dev_dbg(&data->master->dev, | 697 | dev_dbg(&data->master->dev, |
698 | "%s:Invoking callback of SPI core\n", __func__); | 698 | "%s:Invoking callback of SPI core\n", __func__); |
699 | data->current_msg->complete(data->current_msg->context); | 699 | data->current_msg->complete(data->current_msg->context); |
@@ -1186,7 +1186,7 @@ static void pch_spi_process_messages(struct work_struct *pwork) | |||
1186 | list_for_each_entry_safe(pmsg, tmp, data->queue.next, queue) { | 1186 | list_for_each_entry_safe(pmsg, tmp, data->queue.next, queue) { |
1187 | pmsg->status = -EIO; | 1187 | pmsg->status = -EIO; |
1188 | 1188 | ||
1189 | if (pmsg->complete != 0) { | 1189 | if (pmsg->complete) { |
1190 | spin_unlock(&data->lock); | 1190 | spin_unlock(&data->lock); |
1191 | pmsg->complete(pmsg->context); | 1191 | pmsg->complete(pmsg->context); |
1192 | spin_lock(&data->lock); | 1192 | spin_lock(&data->lock); |