diff options
Diffstat (limited to 'include/linux/firewire.h')
| -rw-r--r-- | include/linux/firewire.h | 11 | 
1 files changed, 7 insertions, 4 deletions
| diff --git a/include/linux/firewire.h b/include/linux/firewire.h index aec8f30ab200..07967a450eaa 100644 --- a/include/linux/firewire.h +++ b/include/linux/firewire.h @@ -436,6 +436,12 @@ typedef void (*fw_iso_callback_t)(struct fw_iso_context *context,  				  void *header, void *data);  typedef void (*fw_iso_mc_callback_t)(struct fw_iso_context *context,  				     dma_addr_t completed, void *data); + +union fw_iso_callback { +	fw_iso_callback_t sc; +	fw_iso_mc_callback_t mc; +}; +  struct fw_iso_context {  	struct fw_card *card;  	int type; @@ -443,10 +449,7 @@ struct fw_iso_context {  	int speed;  	bool drop_overflow_headers;  	size_t header_size; -	union { -		fw_iso_callback_t sc; -		fw_iso_mc_callback_t mc; -	} callback; +	union fw_iso_callback callback;  	void *callback_data;  }; |