summaryrefslogtreecommitdiffstats
path: root/sound/firewire
diff options
context:
space:
mode:
authorTakashi Sakamoto <o-takashi@sakamocchi.jp>2013-07-10 00:22:46 +0900
committerTakashi Iwai <tiwai@suse.de>2013-07-10 17:50:58 +0200
commitb6c44f41823e50a5e109e929e07d787eabf4b0d3 (patch)
tree190742c3adf8eb18983cf20346baaaf652b0c127 /sound/firewire
parent69358fca4203eda93e008f234fabf603d9dba15e (diff)
downloadop-kernel-dev-b6c44f41823e50a5e109e929e07d787eabf4b0d3.zip
op-kernel-dev-b6c44f41823e50a5e109e929e07d787eabf4b0d3.tar.gz
ALSA: firewire-speakers: remove not-reused member from structure
"pcm" member in struct fwspk is used to set pcm operations but is not used again. This commit remove this member and set pcm operations with snd_pcm_set_ops(). Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp> Acked-by: Clemens Ladisch <clemens@ladisch.de> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/firewire')
-rw-r--r--sound/firewire/speakers.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/sound/firewire/speakers.c b/sound/firewire/speakers.c
index d684655..0f1e5d8 100644
--- a/sound/firewire/speakers.c
+++ b/sound/firewire/speakers.c
@@ -49,7 +49,6 @@ struct fwspk {
struct snd_card *card;
struct fw_unit *unit;
const struct device_info *device_info;
- struct snd_pcm_substream *pcm;
struct mutex mutex;
struct cmp_connection connection;
struct amdtp_out_stream stream;
@@ -363,8 +362,7 @@ static int fwspk_create_pcm(struct fwspk *fwspk)
return err;
pcm->private_data = fwspk;
strcpy(pcm->name, fwspk->device_info->short_name);
- fwspk->pcm = pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream;
- fwspk->pcm->ops = &ops;
+ snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &ops);
return 0;
}
OpenPOWER on IntegriCloud