diff options
Diffstat (limited to 'drivers/ieee1394/ohci1394.h')
-rw-r--r-- | drivers/ieee1394/ohci1394.h | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/drivers/ieee1394/ohci1394.h b/drivers/ieee1394/ohci1394.h index f1ad539e7c1b..4320bf010495 100644 --- a/drivers/ieee1394/ohci1394.h +++ b/drivers/ieee1394/ohci1394.h | |||
@@ -190,23 +190,10 @@ struct ti_ohci { | |||
190 | unsigned long ir_multichannel_used; /* ditto */ | 190 | unsigned long ir_multichannel_used; /* ditto */ |
191 | spinlock_t IR_channel_lock; | 191 | spinlock_t IR_channel_lock; |
192 | 192 | ||
193 | /* iso receive (legacy API) */ | ||
194 | u64 ir_legacy_channels; /* note: this differs from ISO_channel_usage; | ||
195 | it only accounts for channels listened to | ||
196 | by the legacy API, so that we can know when | ||
197 | it is safe to free the legacy API context */ | ||
198 | |||
199 | struct dma_rcv_ctx ir_legacy_context; | ||
200 | struct ohci1394_iso_tasklet ir_legacy_tasklet; | ||
201 | |||
202 | /* iso transmit */ | 193 | /* iso transmit */ |
203 | int nb_iso_xmit_ctx; | 194 | int nb_iso_xmit_ctx; |
204 | unsigned long it_ctx_usage; /* use test_and_set_bit() for atomicity */ | 195 | unsigned long it_ctx_usage; /* use test_and_set_bit() for atomicity */ |
205 | 196 | ||
206 | /* iso transmit (legacy API) */ | ||
207 | struct dma_trm_ctx it_legacy_context; | ||
208 | struct ohci1394_iso_tasklet it_legacy_tasklet; | ||
209 | |||
210 | u64 ISO_channel_usage; | 197 | u64 ISO_channel_usage; |
211 | 198 | ||
212 | /* IEEE-1394 part follows */ | 199 | /* IEEE-1394 part follows */ |
@@ -221,7 +208,6 @@ struct ti_ohci { | |||
221 | 208 | ||
222 | /* Tasklets for iso receive and transmit, used by video1394 | 209 | /* Tasklets for iso receive and transmit, used by video1394 |
223 | * and dv1394 */ | 210 | * and dv1394 */ |
224 | |||
225 | struct list_head iso_tasklet_list; | 211 | struct list_head iso_tasklet_list; |
226 | spinlock_t iso_tasklet_list_lock; | 212 | spinlock_t iso_tasklet_list_lock; |
227 | 213 | ||