Merge remote-tracking branches 'spi/topic/res', 'spi/topic/rockchip', 'spi/topic/sh', 'spi/topic/ti-qspi' and 'spi/topic/xilinx' into spi-next

This commit is contained in:
Mark Brown 2016-03-11 14:28:53 +07:00
6 changed files with 176 additions and 57 deletions

View file

@ -604,6 +604,10 @@ extern struct spi_master *spi_busnum_to_master(u16 busnum);
* SPI resource management while processing a SPI message
*/
typedef void (*spi_res_release_t)(struct spi_master *master,
struct spi_message *msg,
void *res);
/**
* struct spi_res - spi resource management structure
* @entry: list entry
@ -613,9 +617,6 @@ extern struct spi_master *spi_busnum_to_master(u16 busnum);
* this is based on ideas from devres, but focused on life-cycle
* management during spi_message processing
*/
typedef void (*spi_res_release_t)(struct spi_master *master,
struct spi_message *msg,
void *res);
struct spi_res {
struct list_head entry;
spi_res_release_t release;