mirror of
https://github.com/torvalds/linux.git
synced 2024-12-27 05:11:48 +00:00
ALSA: Use dma_zalloc_coherent
Use the zeroing function instead of dma_alloc_coherent & memset(,0,) Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
parent
74b0c2d75f
commit
7f0f20486f
@ -47,15 +47,11 @@ static int alloc_dbdma_descriptor_ring(struct i2sbus_dev *i2sdev,
|
||||
/* We use the PCI APIs for now until the generic one gets fixed
|
||||
* enough or until we get some macio-specific versions
|
||||
*/
|
||||
r->space = dma_alloc_coherent(
|
||||
&macio_get_pci_dev(i2sdev->macio)->dev,
|
||||
r->size,
|
||||
&r->bus_addr,
|
||||
GFP_KERNEL);
|
||||
r->space = dma_zalloc_coherent(&macio_get_pci_dev(i2sdev->macio)->dev,
|
||||
r->size, &r->bus_addr, GFP_KERNEL);
|
||||
if (!r->space)
|
||||
return -ENOMEM;
|
||||
|
||||
if (!r->space) return -ENOMEM;
|
||||
|
||||
memset(r->space, 0, r->size);
|
||||
r->cmds = (void*)DBDMA_ALIGN(r->space);
|
||||
r->bus_cmd_start = r->bus_addr +
|
||||
(dma_addr_t)((char*)r->cmds - (char*)r->space);
|
||||
|
@ -2534,12 +2534,10 @@ static int snd_dbri_create(struct snd_card *card,
|
||||
dbri->op = op;
|
||||
dbri->irq = irq;
|
||||
|
||||
dbri->dma = dma_alloc_coherent(&op->dev,
|
||||
sizeof(struct dbri_dma),
|
||||
dbri->dma = dma_zalloc_coherent(&op->dev, sizeof(struct dbri_dma),
|
||||
&dbri->dma_dvma, GFP_ATOMIC);
|
||||
if (!dbri->dma)
|
||||
return -ENOMEM;
|
||||
memset((void *)dbri->dma, 0, sizeof(struct dbri_dma));
|
||||
|
||||
dprintk(D_GEN, "DMA Cmd Block 0x%p (0x%08x)\n",
|
||||
dbri->dma, dbri->dma_dvma);
|
||||
|
Loading…
Reference in New Issue
Block a user