From mboxrd@z Thu Jan 1 00:00:00 1970 From: Peter Ujfalusi Subject: Re: [PATCH] ASoC: omap-pcm: Move omap-pcm under include/sound Date: Mon, 26 May 2014 12:00:14 +0300 Message-ID: <5383029E.8080508@ti.com> References: <1401094274-5266-1-git-send-email-jsarha@ti.com> Mime-Version: 1.0 Content-Type: text/plain; charset="ISO-8859-1" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1401094274-5266-1-git-send-email-jsarha@ti.com> Sender: linux-omap-owner@vger.kernel.org To: Jyri Sarha , alsa-devel@alsa-project.org, linux-omap@vger.kernel.org Cc: broonie@kernel.org, liam.r.girdwood@linux.intel.com, detheridge@ti.com List-Id: alsa-devel@alsa-project.org On 05/26/2014 11:51 AM, Jyri Sarha wrote: > Make including the omap-pcm.h outside sound/soc/omap more convenient. Acked-by: Peter Ujfalusi > > Signed-off-by: Jyri Sarha > --- > It would be nice to get this applied at ASAP for OMAP HDMI audio > rework patches depend on this and it would help a lot if this would > already be there when applying to OMAPDSS side patches. > > include/sound/omap-pcm.h | 30 ++++++++++++++++++++++++++++++ > sound/soc/davinci/davinci-mcasp.c | 2 +- > sound/soc/omap/omap-dmic.c | 2 +- > sound/soc/omap/omap-hdmi.c | 2 +- > sound/soc/omap/omap-mcbsp.c | 2 +- > sound/soc/omap/omap-mcpdm.c | 2 +- > sound/soc/omap/omap-pcm.h | 30 ------------------------------ > 7 files changed, 35 insertions(+), 35 deletions(-) > create mode 100644 include/sound/omap-pcm.h > delete mode 100644 sound/soc/omap/omap-pcm.h > > diff --git a/include/sound/omap-pcm.h b/include/sound/omap-pcm.h > new file mode 100644 > index 0000000..c1d2f31 > --- /dev/null > +++ b/include/sound/omap-pcm.h > @@ -0,0 +1,30 @@ > +/* > + * omap-pcm.h - OMAP PCM driver > + * > + * Copyright (C) 2014 Texas Instruments, Inc. > + * > + * Author: Peter Ujfalusi > + * > + * This program is free software; you can redistribute it and/or > + * modify it under the terms of the GNU General Public License > + * version 2 as published by the Free Software Foundation. > + * > + * This program is distributed in the hope that it will be useful, but > + * WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > + * General Public License for more details. > + */ > + > +#ifndef __OMAP_PCM_H__ > +#define __OMAP_PCM_H__ > + > +#if IS_ENABLED(CONFIG_SND_OMAP_SOC) > +int omap_pcm_platform_register(struct device *dev); > +#else > +static inline int omap_pcm_platform_register(struct device *dev) > +{ > + return 0; > +} > +#endif /* CONFIG_SND_OMAP_SOC */ > + > +#endif /* __OMAP_PCM_H__ */ > diff --git a/sound/soc/davinci/davinci-mcasp.c b/sound/soc/davinci/davinci-mcasp.c > index 14058dc..9afb146 100644 > --- a/sound/soc/davinci/davinci-mcasp.c > +++ b/sound/soc/davinci/davinci-mcasp.c > @@ -33,10 +33,10 @@ > #include > #include > #include > +#include > > #include "davinci-pcm.h" > #include "davinci-mcasp.h" > -#include "../omap/omap-pcm.h" > > #define MCASP_MAX_AFIFO_DEPTH 64 > > diff --git a/sound/soc/omap/omap-dmic.c b/sound/soc/omap/omap-dmic.c > index 53da041..6925d71 100644 > --- a/sound/soc/omap/omap-dmic.c > +++ b/sound/soc/omap/omap-dmic.c > @@ -40,9 +40,9 @@ > #include > #include > #include > +#include > > #include "omap-dmic.h" > -#include "omap-pcm.h" > > struct omap_dmic { > struct device *dev; > diff --git a/sound/soc/omap/omap-hdmi.c b/sound/soc/omap/omap-hdmi.c > index 537a1ec..eb9c392 100644 > --- a/sound/soc/omap/omap-hdmi.c > +++ b/sound/soc/omap/omap-hdmi.c > @@ -34,9 +34,9 @@ > #include > #include > #include