ALSA: pcm: Embed struct device
Like previous patches, at this time we embed the struct device into PCM object. However, this needs a bit more caution: struct snd_pcm doesn't own one device but two, for both playback and capture! Thus not struct snd_pcm but struct snd_pcm_str object contains the device. Along with this change, pcm->dev field is dropped for avoiding confusion. It was meant to point to a non-standard parent. But, since now we can touch each struct device directly, we can manipulate the parent field easily there, too. Reviewed-by: Jaroslav Kysela <perex@perex.cz> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Tento commit je obsažen v:
@@ -968,7 +968,6 @@ i2sbus_attach_codec(struct soundbus_dev *dev, struct snd_card *card,
|
||||
printk(KERN_DEBUG "i2sbus: failed to create pcm\n");
|
||||
goto out_put_ci_module;
|
||||
}
|
||||
dev->pcm->dev = &dev->ofdev.dev;
|
||||
}
|
||||
|
||||
/* ALSA yet again sucks.
|
||||
@@ -988,6 +987,8 @@ i2sbus_attach_codec(struct soundbus_dev *dev, struct snd_card *card,
|
||||
goto out_put_ci_module;
|
||||
snd_pcm_set_ops(dev->pcm, SNDRV_PCM_STREAM_PLAYBACK,
|
||||
&i2sbus_playback_ops);
|
||||
dev->pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].dev.parent =
|
||||
&dev->ofdev.dev;
|
||||
i2sdev->out.created = 1;
|
||||
}
|
||||
|
||||
@@ -1003,6 +1004,8 @@ i2sbus_attach_codec(struct soundbus_dev *dev, struct snd_card *card,
|
||||
goto out_put_ci_module;
|
||||
snd_pcm_set_ops(dev->pcm, SNDRV_PCM_STREAM_CAPTURE,
|
||||
&i2sbus_record_ops);
|
||||
dev->pcm->streams[SNDRV_PCM_STREAM_CAPTURE].dev.parent =
|
||||
&dev->ofdev.dev;
|
||||
i2sdev->in.created = 1;
|
||||
}
|
||||
|
||||
|
Odkázat v novém úkolu
Zablokovat Uživatele