All of lore.kernel.org
 help / color / mirror / Atom feed
From: Lars-Peter Clausen <lars@metafoo.de>
To: Mark Brown <broonie@kernel.org>, Liam Girdwood <lgirdwood@gmail.com>
Cc: Brian Austin <brian.austin@cirrus.com>,
	Lars-Peter Clausen <lars@metafoo.de>,
	Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>,
	alsa-devel@alsa-project.org,
	Paul Handrigan <Paul.Handrigan@cirrus.com>,
	Peter Ujfalusi <peter.ujfalusi@ti.com>,
	Jyri Sarha <jsarha@ti.com>,
	Jarkko Nikula <jarkko.nikula@bitmer.com>
Subject: [PATCH 4/5] ASoC: rcar: Fix dma direction type
Date: Thu, 19 Jun 2014 09:40:30 +0200	[thread overview]
Message-ID: <1403163631-26215-5-git-send-email-lars@metafoo.de> (raw)
In-Reply-To: <1403163631-26215-1-git-send-email-lars@metafoo.de>

dmaengine_prep_slave_single() expects a enum dma_transfer_direction and not a
enum dma_data_direction. Since the integer representations of both DMA_TO_DEVICE
and DMA_MEM_TO_DEV aswell as DMA_FROM_DEVICE and DMA_DEV_TO_MEM have the same
value the code worked fine even though it was using the wrong type.

Fixes the following warning from sparse:
	sound/soc/sh/rcar/core.c:227:49: warning: mixing different enum types
	sound/soc/sh/rcar/core.c:227:49:     int enum dma_data_direction  versus
	sound/soc/sh/rcar/core.c:227:49:     int enum dma_transfer_direction

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
---
 sound/soc/sh/rcar/core.c | 2 +-
 sound/soc/sh/rcar/rsnd.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c
index 4e86265..518a78c 100644
--- a/sound/soc/sh/rcar/core.c
+++ b/sound/soc/sh/rcar/core.c
@@ -363,7 +363,7 @@ int rsnd_dma_init(struct rsnd_priv *priv, struct rsnd_dma *dma,
 	if (ret < 0)
 		goto rsnd_dma_init_err;
 
-	dma->dir = is_play ? DMA_TO_DEVICE : DMA_FROM_DEVICE;
+	dma->dir = is_play ? DMA_MEM_TO_DEV : DMA_DEV_TO_MEM;
 	INIT_WORK(&dma->work, rsnd_dma_do_work);
 
 	return 0;
diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h
index 39d98af..067a89e 100644
--- a/sound/soc/sh/rcar/rsnd.h
+++ b/sound/soc/sh/rcar/rsnd.h
@@ -158,7 +158,7 @@ struct rsnd_dma {
 	struct sh_dmae_slave	slave;
 	struct work_struct	work;
 	struct dma_chan		*chan;
-	enum dma_data_direction dir;
+	enum dma_transfer_direction dir;
 
 	int submit_loop;
 	int offset; /* it cares A/B plane */
-- 
1.8.0

  parent reply	other threads:[~2014-06-19  7:40 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-06-19  7:40 [PATCH 0/5] ASoC: Fix trival sparse warnings Lars-Peter Clausen
2014-06-19  7:40 ` [PATCH 1/5] ASoC: tlv320aic31xx: Remove duplicate const Lars-Peter Clausen
2014-06-21 19:57   ` Mark Brown
2014-06-19  7:40 ` [PATCH 2/5] ASoC: cs42xx8: Make of match table static Lars-Peter Clausen
2014-06-19 13:50   ` Brian Austin
2014-06-21 19:58   ` Mark Brown
2014-06-19  7:40 ` [PATCH 3/5] ASoC: omap-pcm: Include omap-pcm.h Lars-Peter Clausen
2014-06-21 20:00   ` Mark Brown
2014-06-30 16:48     ` Lars-Peter Clausen
2014-06-30 21:54       ` Mark Brown
2014-07-01  5:57         ` Lars-Peter Clausen
2014-06-19  7:40 ` Lars-Peter Clausen [this message]
2014-06-19  9:12   ` [PATCH 4/5] ASoC: rcar: Fix dma direction type Kuninori Morimoto
2014-06-19  9:24     ` Lars-Peter Clausen
2014-06-19  9:38       ` Kuninori Morimoto
2014-06-21 20:00   ` Mark Brown
2014-06-19  7:40 ` [PATCH 5/5] ASoC: sh/fsi: Make one-bit bitfields unsigned Lars-Peter Clausen
2014-06-19  9:12   ` Kuninori Morimoto
2014-06-21 20:02   ` Mark Brown

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=1403163631-26215-5-git-send-email-lars@metafoo.de \
    --to=lars@metafoo.de \
    --cc=Paul.Handrigan@cirrus.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=brian.austin@cirrus.com \
    --cc=broonie@kernel.org \
    --cc=jarkko.nikula@bitmer.com \
    --cc=jsarha@ti.com \
    --cc=kuninori.morimoto.gx@renesas.com \
    --cc=lgirdwood@gmail.com \
    --cc=peter.ujfalusi@ti.com \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.