hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
Mark Brown 2014-12-08 12:17:11 +00:00
parent c9508d4b3a 98a8f5a053
commit 19a0368028
2 changed files with 7 additions and 1 deletions
drivers/spi
spi.c
include/linux/spi
spi.h

2
drivers/spi/spi.c
View File

@ -1001,7 +1001,7 @@ static int spi_init_queue(struct spi_master *master)
dev_name(&master->dev)); dev_name(&master->dev));
if (IS_ERR(master->kworker_task)) { if (IS_ERR(master->kworker_task)) {
dev_err(&master->dev, "failed to create message pump task\n"); dev_err(&master->dev, "failed to create message pump task\n");
return -ENOMEM; return PTR_ERR(master->kworker_task);
} }
init_kthread_work(&master->pump_messages, spi_pump_messages); init_kthread_work(&master->pump_messages, spi_pump_messages);

6
include/linux/spi/spi.h
View File

@ -1049,4 +1049,10 @@ spi_unregister_device(struct spi_device *spi)
extern const struct spi_device_id * extern const struct spi_device_id *
spi_get_device_id(const struct spi_device *sdev); spi_get_device_id(const struct spi_device *sdev);
static inline bool
spi_transfer_is_last(struct spi_master *master, struct spi_transfer *xfer)
{
return list_is_last(&xfer->transfer_list, &master->cur_msg->transfers);
}
#endif /* __LINUX_SPI_H */ #endif /* __LINUX_SPI_H */