Patchwork ARM: LPC32xx: Adjust to pl08x DMA interface changes

login
register
mail settings
Submitter stigge@antcom.de
Date July 12, 2012, 12:22 p.m.
Message ID <1342095778-13403-1-git-send-email-stigge@antcom.de>
Download mbox | patch
Permalink /patch/170644/
State New
Headers show

Comments

stigge@antcom.de - July 12, 2012, 12:22 p.m.
This patch adjusts the LPC32xx platform support to the new pl08x DMA interface,
fixing the compile error resulting from changed pl08x structures.

Signed-off-by: Roland Stigge <stigge@antcom.de>

---

Applies to today's linux-next (integrated lpc32xx-next and dma branches which collide)

 arch/arm/mach-lpc32xx/phy3250.c |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
Alexandre Pereira da Silva - July 13, 2012, 12:51 p.m.
On Thu, Jul 12, 2012 at 9:22 AM, Roland Stigge <stigge@antcom.de> wrote:
> This patch adjusts the LPC32xx platform support to the new pl08x DMA interface,
> fixing the compile error resulting from changed pl08x structures.
>
> Signed-off-by: Roland Stigge <stigge@antcom.de>

Acked-By: Alexandre Pereira da Silva <aletes.xgr@gmail.com>

> ---
>
> Applies to today's linux-next (integrated lpc32xx-next and dma branches which collide)
>
>  arch/arm/mach-lpc32xx/phy3250.c |    7 +++----
>  1 file changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm/mach-lpc32xx/phy3250.c b/arch/arm/mach-lpc32xx/phy3250.c
> index 8625237..b07dcc9 100644
> --- a/arch/arm/mach-lpc32xx/phy3250.c
> +++ b/arch/arm/mach-lpc32xx/phy3250.c
> @@ -186,13 +186,12 @@ static struct pl08x_channel_data pl08x_slave_channels[] = {
>         },
>  };
>
> -/* NOTE: These will change, according to RMK */
> -static int pl08x_get_signal(struct pl08x_dma_chan *ch)
> +static int pl08x_get_signal(const struct pl08x_channel_data *cd)
>  {
> -       return ch->cd->min_signal;
> +       return cd->min_signal;
>  }
>
> -static void pl08x_put_signal(struct pl08x_dma_chan *ch)
> +static void pl08x_put_signal(const struct pl08x_channel_data *cd, int ch)
>  {
>  }
>
> --
> 1.7.10.4
>

Patch

diff --git a/arch/arm/mach-lpc32xx/phy3250.c b/arch/arm/mach-lpc32xx/phy3250.c
index 8625237..b07dcc9 100644
--- a/arch/arm/mach-lpc32xx/phy3250.c
+++ b/arch/arm/mach-lpc32xx/phy3250.c
@@ -186,13 +186,12 @@  static struct pl08x_channel_data pl08x_slave_channels[] = {
 	},
 };
 
-/* NOTE: These will change, according to RMK */
-static int pl08x_get_signal(struct pl08x_dma_chan *ch)
+static int pl08x_get_signal(const struct pl08x_channel_data *cd)
 {
-	return ch->cd->min_signal;
+	return cd->min_signal;
 }
 
-static void pl08x_put_signal(struct pl08x_dma_chan *ch)
+static void pl08x_put_signal(const struct pl08x_channel_data *cd, int ch)
 {
 }