Commit 0b6a2c9c authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: isa: Avoid passing NULL to memory allocators 



We used to pass NULL to memory allocators for ISA devices due to
historical reasons.  But we prefer rather a proper device object to be
assigned, so let's fix it by replacing snd_dma_isa_data() call with
card->dev reference, and kill snd_dma_isa_data() definition.

Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 6a8125c3

Documentation/sound/kernel-api/writing-an-alsa-driver.rst

+5 −5
Original line number Diff line number Diff line
@@ -3520,14 +3520,14 @@ allocator will try to get an area as large as possible within the 
given size.



The second argument (type) and the third argument (device pointer) are

dependent on the bus. In the case of the ISA bus, pass

:c:func:`snd_dma_isa_data()` as the third argument with

dependent on the bus. For normal devices, pass the device pointer

(typically identical as ``card->dev``) to the third argument with

``SNDRV_DMA_TYPE_DEV`` type. For the continuous buffer unrelated to the

bus can be pre-allocated with ``SNDRV_DMA_TYPE_CONTINUOUS`` type and the

``snd_dma_continuous_data(GFP_KERNEL)`` device pointer, where

``GFP_KERNEL`` is the kernel allocation flag to use. For the PCI

scatter-gather buffers, use ``SNDRV_DMA_TYPE_DEV_SG`` with

``snd_dma_pci_data(pci)`` (see the `Non-Contiguous Buffers`_

``GFP_KERNEL`` is the kernel allocation flag to use. For the

scatter-gather buffers, use ``SNDRV_DMA_TYPE_DEV_SG`` with the device

pointer (see the `Non-Contiguous Buffers`_

section).



Once the buffer is pre-allocated, you can use the allocator in the

include/sound/memalloc.h

+0 −1
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ struct snd_dma_device { 
};



#define snd_dma_pci_data(pci)	(&(pci)->dev)

#define snd_dma_isa_data()	NULL

#define snd_dma_continuous_data(x)	((struct device *)(__force unsigned long)(x))

sound/isa/ad1816a/ad1816a_lib.c

+1 −1
Original line number Diff line number Diff line
@@ -693,7 +693,7 @@ int snd_ad1816a_pcm(struct snd_ad1816a *chip, int device) 
	snd_ad1816a_init(chip);



	snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,

					      snd_dma_isa_data(),

					      chip->card->dev,

					      64*1024, chip->dma1 > 3 || chip->dma2 > 3 ? 128*1024 : 64*1024);



	chip->pcm = pcm;

sound/isa/cmi8330.c

+1 −1
Original line number Diff line number Diff line
@@ -470,7 +470,7 @@ static int snd_cmi8330_pcm(struct snd_card *card, struct snd_cmi8330 *chip) 
	snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &chip->streams[SNDRV_PCM_STREAM_CAPTURE].ops);



	snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,

					      snd_dma_isa_data(),

					      card->dev,

					      64*1024, 128*1024);

	chip->pcm = pcm;

sound/isa/es1688/es1688_lib.c

+1 −1
Original line number Diff line number Diff line
@@ -746,7 +746,7 @@ int snd_es1688_pcm(struct snd_card *card, struct snd_es1688 *chip, int device) 
	chip->pcm = pcm;



	snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,

					      snd_dma_isa_data(),

					      card->dev,

					      64*1024, 64*1024);

	return 0;

}