tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge remote-tracking branch 'spi/topic/topcliff' into spi-next

Mark Brown cf7315b2 adb25d53

+4 -4
+4 -4
drivers/spi/spi-topcliff-pch.c
··· 367 367 368 368 if (reg_spsr_val & SPSR_ORF_BIT) { 369 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 371 data->transfer_complete = true; 372 372 data->current_msg->status = -EIO; 373 373 data->current_msg->complete(data->current_msg->context); ··· 643 643 list_for_each_entry_safe(pmsg, tmp, data->queue.next, queue) { 644 644 pmsg->status = -ENOMEM; 645 645 646 - if (pmsg->complete != 0) 646 + if (pmsg->complete) 647 647 pmsg->complete(pmsg->context); 648 648 649 649 /* delete from queue */ ··· 693 693 * [To the spi core..indicating end of transfer] */ 694 694 data->current_msg->status = 0; 695 695 696 - if (data->current_msg->complete != 0) { 696 + if (data->current_msg->complete) { 697 697 dev_dbg(&data->master->dev, 698 698 "%s:Invoking callback of SPI core\n", __func__); 699 699 data->current_msg->complete(data->current_msg->context); ··· 1186 1186 list_for_each_entry_safe(pmsg, tmp, data->queue.next, queue) { 1187 1187 pmsg->status = -EIO; 1188 1188 1189 - if (pmsg->complete != 0) { 1189 + if (pmsg->complete) { 1190 1190 spin_unlock(&data->lock); 1191 1191 pmsg->complete(pmsg->context); 1192 1192 spin_lock(&data->lock);