Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-01-01 07:42:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

ASoC: sh: fix fsi build warnings for 64 bit

Browse Source 
As this driver can now be compiled for ARM64, we get a new warning
as a result of passing a DMA filter data pointer through an 'int':

sound/soc/sh/fsi.c: In function 'fsi_dma_probe':
sound/soc/sh/fsi.c:1372:24: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
     shdma_chan_filter, (void *)io->dma_id,

We already know that we only need the legacy filter function on
arch/sh, so we can hide the legacy DMA interface function
behind an #ifdef. This has the other advantage of no longer
depending on the shdma_chan_filter function to be visible.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Arnd Bergmann 2015-11-18 22:16:48 +01:00 committed by Mark Brown
parent 8005c49d9a
commit e6e969f1fd
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sound/soc/sh/fsi.c
View File

@ -1362,15 +1362,18 @@ static int fsi_dma_push_start_stop(struct fsi_priv *fsi, struct fsi_stream *io,
static int fsi_dma_probe(struct fsi_priv *fsi, struct fsi_stream *io, struct device *dev)
{
dma_cap_mask_t mask;
int is_play = fsi_stream_is_play(fsi, io);
#ifdef CONFIG_SUPERH
dma_cap_mask_t mask;
dma_cap_zero(mask);
dma_cap_set(DMA_SLAVE, mask);
io->chan = dma_request_slave_channel_compat(mask,
shdma_chan_filter, (void *)io->dma_id,
dev, is_play ? "tx" : "rx");
io->chan = dma_request_channel(mask, shdma_chan_filter,
(void *)io->dma_id);
#else
io->chan = dma_request_slave_channel(dev, is_play ? "tx" : "rx");
#endif
if (io->chan) {
struct dma_slave_config cfg = {};
int ret;