mirror of
https://github.com/edk2-porting/linux-next.git
synced 2025-01-22 20:43:56 +08:00
ALSA: echoaudio: Avoid non-standard macro usage
Pass the device pointer from the PCI pointer directly, instead of a non-standard macro. The macro didn't give any better readability. Also slightly refactor the code (drop the return value check from the preallocation) as it never returns an error. Link: https://lore.kernel.org/r/20191105151856.10785-21-tiwai@suse.de Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
parent
3ca5fc0664
commit
7564d3b633
@ -324,7 +324,7 @@ static int pcm_open(struct snd_pcm_substream *substream,
|
||||
|
||||
/* Finally allocate a page for the scatter-gather list */
|
||||
if ((err = snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV,
|
||||
snd_dma_pci_data(chip->pci),
|
||||
&chip->pci->dev,
|
||||
PAGE_SIZE, &pipe->sgpage)) < 0) {
|
||||
dev_err(chip->card->dev, "s-g list allocation failed\n");
|
||||
return err;
|
||||
@ -865,7 +865,7 @@ static const struct snd_pcm_ops digital_capture_ops = {
|
||||
/* Preallocate memory only for the first substream because it's the most
|
||||
* used one
|
||||
*/
|
||||
static int snd_echo_preallocate_pages(struct snd_pcm *pcm, struct device *dev)
|
||||
static void snd_echo_preallocate_pages(struct snd_pcm *pcm, struct device *dev)
|
||||
{
|
||||
struct snd_pcm_substream *ss;
|
||||
int stream;
|
||||
@ -876,8 +876,6 @@ static int snd_echo_preallocate_pages(struct snd_pcm *pcm, struct device *dev)
|
||||
dev,
|
||||
ss->number ? 0 : 128<<10,
|
||||
256<<10);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
@ -904,8 +902,7 @@ static int snd_echo_new_pcm(struct echoaudio *chip)
|
||||
strcpy(pcm->name, chip->card->shortname);
|
||||
snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &analog_playback_ops);
|
||||
snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &analog_capture_ops);
|
||||
if ((err = snd_echo_preallocate_pages(pcm, snd_dma_pci_data(chip->pci))) < 0)
|
||||
return err;
|
||||
snd_echo_preallocate_pages(pcm, &chip->pci->dev);
|
||||
|
||||
#ifdef ECHOCARD_HAS_DIGITAL_IO
|
||||
/* PCM#1 Digital inputs, no outputs */
|
||||
@ -916,8 +913,7 @@ static int snd_echo_new_pcm(struct echoaudio *chip)
|
||||
chip->digital_pcm = pcm;
|
||||
strcpy(pcm->name, chip->card->shortname);
|
||||
snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &digital_capture_ops);
|
||||
if ((err = snd_echo_preallocate_pages(pcm, snd_dma_pci_data(chip->pci))) < 0)
|
||||
return err;
|
||||
snd_echo_preallocate_pages(pcm, &chip->pci->dev);
|
||||
#endif /* ECHOCARD_HAS_DIGITAL_IO */
|
||||
|
||||
#else /* ECHOCARD_HAS_VMIXER */
|
||||
@ -937,8 +933,7 @@ static int snd_echo_new_pcm(struct echoaudio *chip)
|
||||
strcpy(pcm->name, chip->card->shortname);
|
||||
snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &analog_playback_ops);
|
||||
snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &analog_capture_ops);
|
||||
if ((err = snd_echo_preallocate_pages(pcm, snd_dma_pci_data(chip->pci))) < 0)
|
||||
return err;
|
||||
snd_echo_preallocate_pages(pcm, &chip->pci->dev);
|
||||
|
||||
#ifdef ECHOCARD_HAS_DIGITAL_IO
|
||||
/* PCM#1 Digital i/o */
|
||||
@ -951,8 +946,7 @@ static int snd_echo_new_pcm(struct echoaudio *chip)
|
||||
strcpy(pcm->name, chip->card->shortname);
|
||||
snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &digital_playback_ops);
|
||||
snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &digital_capture_ops);
|
||||
if ((err = snd_echo_preallocate_pages(pcm, snd_dma_pci_data(chip->pci))) < 0)
|
||||
return err;
|
||||
snd_echo_preallocate_pages(pcm, &chip->pci->dev);
|
||||
#endif /* ECHOCARD_HAS_DIGITAL_IO */
|
||||
|
||||
#endif /* ECHOCARD_HAS_VMIXER */
|
||||
@ -1954,7 +1948,7 @@ static int snd_echo_create(struct snd_card *card,
|
||||
|
||||
/* Create the DSP comm page - this is the area of memory used for most
|
||||
of the communication with the DSP, which accesses it via bus mastering */
|
||||
if (snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(chip->pci),
|
||||
if (snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, &chip->pci->dev,
|
||||
sizeof(struct comm_page),
|
||||
&chip->commpage_dma_buf) < 0) {
|
||||
dev_err(chip->card->dev, "cannot allocate the comm page\n");
|
||||
|
Loading…
Reference in New Issue
Block a user