lkml.org 
[lkml]   [2013]   [Oct]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [PATCH v8 14/19] ASoC: Samsung: Rename dma_ops by samsung_dma_ops
    (Add samsung sounds maintainers)

    On 10/17/2013 06:43 PM, Stefano Stabellini wrote:
    > 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,
    > };
    >

    --
    Julien Grall


    \
     
     \ /
      Last update: 2013-10-23 17:01    [W:4.397 / U:0.564 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site