diff options
| author | Daniel Mack <zonque@gmail.com> | 2012-04-21 13:52:12 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-04-21 17:40:28 +0200 |
| commit | c89a5d9cacf2b862fea986a30b75359f6cf997c1 (patch) | |
| tree | d3c450a860f18028dd7d509159bc08c7b76dd804 /sound/usb | |
| parent | f6e94c372e3d37e25728275dfe60ad591d207a50 (diff) | |
| download | linux-3.10-c89a5d9cacf2b862fea986a30b75359f6cf997c1.tar.gz linux-3.10-c89a5d9cacf2b862fea986a30b75359f6cf997c1.tar.bz2 linux-3.10-c89a5d9cacf2b862fea986a30b75359f6cf997c1.zip | |
ALSA: snd-usb: remove refactorization left-overs
Drop some struct members and definitions that became obsolete during
the refactorization of the driver.
Signed-off-by: Daniel Mack <zonque@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/usb')
| -rw-r--r-- | sound/usb/card.h | 13 | ||||
| -rw-r--r-- | sound/usb/proc.c | 6 |
2 files changed, 1 insertions, 18 deletions
diff --git a/sound/usb/card.h b/sound/usb/card.h index 77d2eec5e89..0d37238b845 100644 --- a/sound/usb/card.h +++ b/sound/usb/card.h @@ -43,13 +43,6 @@ struct snd_urb_ctx { struct list_head ready_list; }; -struct snd_urb_ops { - int (*prepare)(struct snd_usb_substream *subs, struct snd_pcm_runtime *runtime, struct urb *u); - int (*retire)(struct snd_usb_substream *subs, struct snd_pcm_runtime *runtime, struct urb *u); - int (*prepare_sync)(struct snd_usb_substream *subs, struct snd_pcm_runtime *runtime, struct urb *u); - int (*retire_sync)(struct snd_usb_substream *subs, struct snd_pcm_runtime *runtime, struct urb *u); -}; - struct snd_usb_endpoint { struct snd_usb_audio *chip; @@ -125,11 +118,6 @@ struct snd_usb_substream { unsigned long active_mask; /* bitmask of active urbs */ unsigned long unlink_mask; /* bitmask of unlinked urbs */ - unsigned int nurbs; /* # urbs */ - struct snd_urb_ctx dataurb[MAX_URBS]; /* data urb table */ - struct snd_urb_ctx syncurb[SYNC_URBS]; /* sync urb table */ - char *syncbuf; /* sync buffer for all sync URBs */ - dma_addr_t sync_dma; /* DMA address of syncbuf */ /* data and sync endpoints for this stream */ struct snd_usb_endpoint *data_endpoint; struct snd_usb_endpoint *sync_endpoint; @@ -141,7 +129,6 @@ struct snd_usb_substream { struct snd_pcm_hw_constraint_list rate_list; /* limited rates */ spinlock_t lock; - struct snd_urb_ops ops; /* callbacks (must be filled at init) */ int last_frame_number; /* stored frame number */ int last_delay; /* stored delay */ }; diff --git a/sound/usb/proc.c b/sound/usb/proc.c index 06e23d89d11..ebc1a5b5b3f 100644 --- a/sound/usb/proc.c +++ b/sound/usb/proc.c @@ -25,6 +25,7 @@ #include "usbaudio.h" #include "helper.h" #include "card.h" +#include "endpoint.h" #include "proc.h" /* convert our full speed USB rate into sampling rate in Hz */ @@ -137,14 +138,9 @@ static void proc_dump_ep_status(struct snd_usb_substream *subs, static void proc_dump_substream_status(struct snd_usb_substream *subs, struct snd_info_buffer *buffer) { if (subs->running) { - unsigned int i; snd_iprintf(buffer, " Status: Running\n"); snd_iprintf(buffer, " Interface = %d\n", subs->interface); snd_iprintf(buffer, " Altset = %d\n", subs->altset_idx); - snd_iprintf(buffer, " URBs = %d [ ", subs->nurbs); - for (i = 0; i < subs->nurbs; i++) - snd_iprintf(buffer, "%d ", subs->dataurb[i].packets); - snd_iprintf(buffer, "]\n"); proc_dump_ep_status(subs, subs->data_endpoint, buffer); proc_dump_ep_status(subs, subs->sync_endpoint, buffer); } else { |