[alsa-devel] [PATCH -next 00/26] treewide: Use dma_zalloc_coherent
Use the zeroing function instead of dma_alloc_coherent & memset(,0,)
Joe Perches (26): powerpc: Use dma_zalloc_coherent sh: Use dma_zalloc_coherent ata: Use dma_zalloc_coherent block: Use dma_zalloc_coherent crypto: Use dma_zalloc_coherent dma: Use dma_zalloc_coherent gpu: Use dma_zalloc_coherent infiniband: Use dma_zalloc_coherent mmc: Use dma_zalloc_coherent broadcom: Use dma_zalloc_coherent hisilicon: Use dma_zalloc_coherent intel: Use dma_zalloc_coherent ath: Use dma_zalloc_coherent rt2x00: Use dma_zalloc_coherent bfa: Use dma_zalloc_coherent bnx2fc: Use dma_zalloc_coherent bnx2i: Use dma_zalloc_coherent dpt_i2o: Use dma_zalloc_coherent lpfc: Use dma_zalloc_coherent megaraid: Use dma_zalloc_coherent mvsas: Use dma_zalloc_coherent qla2xxx: Use dma_zalloc_coherent qla4xxx: Use dma_zalloc_coherent usb: Use dma_zalloc_coherent fbdev: Use dma_zalloc_coherent sound: Use dma_zalloc_coherent
arch/powerpc/platforms/pasemi/dma_lib.c | 8 ++-- arch/powerpc/sysdev/fsl_rmu.c | 9 ++-- arch/sh/mm/consistent.c | 4 +- drivers/ata/sata_fsl.c | 5 +-- drivers/block/nvme-core.c | 5 +-- drivers/crypto/amcc/crypto4xx_core.c | 8 ++-- drivers/crypto/ixp4xx_crypto.c | 8 ++-- drivers/dma/imx-sdma.c | 5 +-- drivers/dma/mxs-dma.c | 8 ++-- drivers/gpu/drm/drm_pci.c | 6 +-- drivers/infiniband/hw/cxgb3/cxio_hal.c | 7 ++-- drivers/infiniband/hw/mthca/mthca_memfree.c | 5 +-- drivers/infiniband/hw/ocrdma/ocrdma_hw.c | 20 ++++----- drivers/infiniband/hw/ocrdma/ocrdma_stats.c | 6 +-- drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 8 ++-- drivers/mmc/host/msm_sdcc.c | 8 ++-- drivers/net/ethernet/broadcom/bcm63xx_enet.c | 6 +-- drivers/net/ethernet/hisilicon/hix5hd2_gmac.c | 5 +-- drivers/net/ethernet/intel/ixgb/ixgb_main.c | 6 +-- drivers/net/wireless/ath/ath10k/pci.c | 8 +--- drivers/net/wireless/ath/ath10k/wmi.c | 8 +--- drivers/net/wireless/ath/wcn36xx/dxe.c | 6 +-- drivers/net/wireless/rt2x00/rt2x00mmio.c | 8 ++-- drivers/scsi/bfa/bfad_bsg.c | 6 +-- drivers/scsi/bnx2fc/bnx2fc_hwi.c | 59 ++++++++++++--------------- drivers/scsi/bnx2fc/bnx2fc_tgt.c | 51 ++++++++++------------- drivers/scsi/bnx2i/bnx2i_hwi.c | 14 +++---- drivers/scsi/dpt_i2o.c | 19 ++++----- drivers/scsi/lpfc/lpfc_bsg.c | 5 +-- drivers/scsi/lpfc/lpfc_init.c | 22 ++++------ drivers/scsi/lpfc/lpfc_mbox.c | 6 +-- drivers/scsi/lpfc/lpfc_sli.c | 14 +++---- drivers/scsi/megaraid/megaraid_sas_fusion.c | 9 ++-- drivers/scsi/mvsas/mv_init.c | 26 +++++------- drivers/scsi/qla2xxx/qla_init.c | 10 ++--- drivers/scsi/qla4xxx/ql4_init.c | 5 +-- drivers/scsi/qla4xxx/ql4_mbx.c | 21 ++++------ drivers/scsi/qla4xxx/ql4_nx.c | 5 +-- drivers/scsi/qla4xxx/ql4_os.c | 12 +++--- drivers/usb/dwc2/hcd_ddma.c | 20 ++++----- drivers/usb/host/uhci-hcd.c | 7 ++-- drivers/video/fbdev/da8xx-fb.c | 9 ++-- sound/aoa/soundbus/i2sbus/core.c | 12 ++---- sound/sparc/dbri.c | 6 +-- 44 files changed, 197 insertions(+), 308 deletions(-)
Use the zeroing function instead of dma_alloc_coherent & memset(,0,)
Signed-off-by: Joe Perches joe@perches.com --- sound/aoa/soundbus/i2sbus/core.c | 12 ++++-------- sound/sparc/dbri.c | 6 ++---- 2 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/sound/aoa/soundbus/i2sbus/core.c b/sound/aoa/soundbus/i2sbus/core.c index 4678360..a80d5ea 100644 --- a/sound/aoa/soundbus/i2sbus/core.c +++ b/sound/aoa/soundbus/i2sbus/core.c @@ -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); diff --git a/sound/sparc/dbri.c b/sound/sparc/dbri.c index be1b1aa..b2c3d0d 100644 --- a/sound/sparc/dbri.c +++ b/sound/sparc/dbri.c @@ -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_dvma, GFP_ATOMIC); + 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);
At Sun, 15 Jun 2014 13:37:55 -0700, Joe Perches wrote:
Use the zeroing function instead of dma_alloc_coherent & memset(,0,)
Signed-off-by: Joe Perches joe@perches.com
Applied, thanks.
Takashi
sound/aoa/soundbus/i2sbus/core.c | 12 ++++-------- sound/sparc/dbri.c | 6 ++---- 2 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/sound/aoa/soundbus/i2sbus/core.c b/sound/aoa/soundbus/i2sbus/core.c index 4678360..a80d5ea 100644 --- a/sound/aoa/soundbus/i2sbus/core.c +++ b/sound/aoa/soundbus/i2sbus/core.c @@ -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);
diff --git a/sound/sparc/dbri.c b/sound/sparc/dbri.c index be1b1aa..b2c3d0d 100644 --- a/sound/sparc/dbri.c +++ b/sound/sparc/dbri.c @@ -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_dvma, GFP_ATOMIC);
- dbri->dma = dma_zalloc_coherent(&op->dev, sizeof(struct dbri_dma),
&dbri->dma_dvma, GFP_ATOMIC);
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);
-- 1.8.1.2.459.gbcd45b4.dirty
participants (2)
-
Joe Perches -
Takashi Iwai