Commit 1a810436 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: rme: 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.

Along with it, drop the unnecessary assignment before the
snd_dma_alloc_pages() call and simplify by returning the error code
directly.

Link: https://lore.kernel.org/r/20191105151856.10785-23-tiwai@suse.de


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent af7153a2

sound/pci/rme9652/hdsp.c

+1 −6
Original line number Diff line number Diff line
@@ -569,12 +569,7 @@ static char channel_map_H9632_qs[HDSP_MAX_CHANNELS] = { 


static int snd_hammerfall_get_buffer(struct pci_dev *pci, struct snd_dma_buffer *dmab, size_t size)

{

	dmab->dev.type = SNDRV_DMA_TYPE_DEV;

	dmab->dev.dev = snd_dma_pci_data(pci);

	if (snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(pci),

				size, dmab) < 0)

		return -ENOMEM;

	return 0;

	return snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, &pci->dev, size, dmab);

}



static void snd_hammerfall_free_buffer(struct snd_dma_buffer *dmab, struct pci_dev *pci)

sound/pci/rme9652/hdspm.c

+1 −1
Original line number Diff line number Diff line
@@ -6406,7 +6406,7 @@ static int snd_hdspm_preallocate_memory(struct hdspm *hdspm) 
	wanted = HDSPM_DMA_AREA_BYTES;



	snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV_SG,

					      snd_dma_pci_data(hdspm->pci),

					      &hdspm->pci->dev,

					      wanted, wanted);

	dev_dbg(hdspm->card->dev, " Preallocated %zd Bytes\n", wanted);

	return 0;

sound/pci/rme9652/rme9652.c

+1 −6
Original line number Diff line number Diff line
@@ -279,12 +279,7 @@ static char channel_map_9636_ds[26] = { 


static int snd_hammerfall_get_buffer(struct pci_dev *pci, struct snd_dma_buffer *dmab, size_t size)

{

	dmab->dev.type = SNDRV_DMA_TYPE_DEV;

	dmab->dev.dev = snd_dma_pci_data(pci);

	if (snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(pci),

				size, dmab) < 0)

		return -ENOMEM;

	return 0;

	return snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, &pci->dev, size, dmab);

}



static void snd_hammerfall_free_buffer(struct snd_dma_buffer *dmab, struct pci_dev *pci)

CRA Git | Maintained and supported by SUSTech CRA and CCSE