From: stefano.stabellini@eu.citrix.com (Stefano Stabellini)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v8 14/17] ASoC: Samsung: Rename dma_ops by samsung_dma_ops
Date: Wed, 9 Oct 2013 21:48:27 +0100 [thread overview]
Message-ID: <1381351710-1876-14-git-send-email-stefano.stabellini@eu.citrix.com> (raw)
In-Reply-To: <alpine.DEB.2.02.1310092109190.26077@kaball.uk.xensource.com>
From: Julien Grall <julien.grall@linaro.org>
The commit "arm: introduce a global dma_ops pointer" introduce compilation issue
when CONFIG_SND_SOC_SAMSUNG is enabled.
sound/soc/samsung/dma.c:345:27: error: conflicting types for 'dma_ops'
/local/home/julien/works/arndale/linux/arch/arm/include/asm/dma-mapping.h:16:28:
note: previous declaration of 'dma_ops' was here
Signed-off-by: Julien Grall <julien.grall@linaro.org>
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
---
sound/soc/samsung/dma.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sound/soc/samsung/dma.c b/sound/soc/samsung/dma.c
index 21b7926..827c0d8 100644
--- a/sound/soc/samsung/dma.c
+++ b/sound/soc/samsung/dma.c
@@ -341,7 +341,7 @@ static int dma_mmap(struct snd_pcm_substream *substream,
runtime->dma_bytes);
}
-static struct snd_pcm_ops dma_ops = {
+static struct snd_pcm_ops samsung_dma_ops = {
.open = dma_open,
.close = dma_close,
.ioctl = snd_pcm_lib_ioctl,
@@ -428,7 +428,7 @@ out:
}
static struct snd_soc_platform_driver samsung_asoc_platform = {
- .ops = &dma_ops,
+ .ops = &samsung_dma_ops,
.pcm_new = dma_new,
.pcm_free = dma_free_dma_buffers,
};
--
1.7.2.5
next prev parent reply other threads:[~2013-10-09 20:48 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-09 20:47 [PATCH v7 0/17] enable swiotlb-xen on arm and arm64 Stefano Stabellini
2013-10-09 20:48 ` [PATCH v8 01/17] arm: make SWIOTLB available Stefano Stabellini
2013-10-10 9:43 ` Will Deacon
2013-10-15 15:45 ` Stefano Stabellini
2013-10-09 20:48 ` [PATCH v8 02/17] arm64: define DMA_ERROR_CODE Stefano Stabellini
2013-10-10 9:44 ` Will Deacon
2013-10-15 15:46 ` Stefano Stabellini
2013-10-09 20:48 ` [PATCH v8 03/17] arm/xen,arm64/xen: introduce p2m Stefano Stabellini
2013-10-09 20:48 ` [PATCH v8 04/17] xen/x86: allow __set_phys_to_machine for autotranslate guests Stefano Stabellini
2013-10-09 20:48 ` [PATCH v8 05/17] xen: make xen_create_contiguous_region return the dma address Stefano Stabellini
2013-10-09 20:48 ` [PATCH v8 06/17] xen/arm,arm64: enable SWIOTLB_XEN Stefano Stabellini
2013-10-09 20:48 ` [PATCH v8 07/17] swiotlb-xen: introduce xen_swiotlb_set_dma_mask Stefano Stabellini
2013-10-09 20:48 ` [PATCH v8 08/17] arm/xen: get_dma_ops: return xen_dma_ops if we are running as xen_initial_domain Stefano Stabellini
2013-10-09 20:48 ` [PATCH v8 09/17] arm64/xen: " Stefano Stabellini
2013-10-09 20:48 ` [PATCH v8 10/17] xen: introduce xen_alloc/free_coherent_pages Stefano Stabellini
2013-10-09 20:48 ` [PATCH v8 11/17] swiotlb-xen: use xen_alloc/free_coherent_pages Stefano Stabellini
2013-10-09 20:48 ` [PATCH v8 12/17] xen: introduce xen_dma_map/unmap_page and xen_dma_sync_single_for_cpu/device Stefano Stabellini
2013-10-09 20:48 ` [PATCH v8 13/17] swiotlb-xen: use xen_dma_map/unmap_page, xen_dma_sync_single_for_cpu/device Stefano Stabellini
2013-10-09 20:48 ` Stefano Stabellini [this message]
2013-10-09 20:48 ` [PATCH v8 15/17] swiotlb: print a warning when the swiotlb is full Stefano Stabellini
2013-10-09 20:48 ` [PATCH v8 16/17] arm, arm64: do not always merge biovec if we are running on Xen Stefano Stabellini
2013-10-09 20:48 ` [PATCH v8 17/17] grant-table: call set_phys_to_machine after mapping grant refs Stefano Stabellini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1381351710-1876-14-git-send-email-stefano.stabellini@eu.citrix.com \
--to=stefano.stabellini@eu.citrix.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).