ASoC: fsi: fixup sparse errors
This patch fixup below sparse errors ${LINUX}/sound/soc/sh/fsi.c:1459:9: \ error: incompatible types in conditional expression (different base types) ${LINUX}/sound/soc/sh/fsi.c:1634:25: \ error: incompatible types in conditional expression (different base types) ${LINUX}/sound/soc/sh/fsi.c:1639:17: \ error: incompatible types in conditional expression (different base types) ${LINUX}/sound/soc/sh/fsi.c:2093:9: \ error: incompatible types in conditional expression (different base types) ${LINUX}/sound/soc/sh/fsi.c:2105:9: \ error: incompatible types in conditional expression (different base types) Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Родитель
e4aa937ec7
Коммит
c375b2d7ef
|
@ -276,7 +276,7 @@ struct fsi_stream_handler {
|
||||||
int (*probe)(struct fsi_priv *fsi, struct fsi_stream *io, struct device *dev);
|
int (*probe)(struct fsi_priv *fsi, struct fsi_stream *io, struct device *dev);
|
||||||
int (*transfer)(struct fsi_priv *fsi, struct fsi_stream *io);
|
int (*transfer)(struct fsi_priv *fsi, struct fsi_stream *io);
|
||||||
int (*remove)(struct fsi_priv *fsi, struct fsi_stream *io);
|
int (*remove)(struct fsi_priv *fsi, struct fsi_stream *io);
|
||||||
void (*start_stop)(struct fsi_priv *fsi, struct fsi_stream *io,
|
int (*start_stop)(struct fsi_priv *fsi, struct fsi_stream *io,
|
||||||
int enable);
|
int enable);
|
||||||
};
|
};
|
||||||
#define fsi_stream_handler_call(io, func, args...) \
|
#define fsi_stream_handler_call(io, func, args...) \
|
||||||
|
@ -1188,7 +1188,7 @@ static int fsi_pio_push(struct fsi_priv *fsi, struct fsi_stream *io)
|
||||||
samples);
|
samples);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void fsi_pio_start_stop(struct fsi_priv *fsi, struct fsi_stream *io,
|
static int fsi_pio_start_stop(struct fsi_priv *fsi, struct fsi_stream *io,
|
||||||
int enable)
|
int enable)
|
||||||
{
|
{
|
||||||
struct fsi_master *master = fsi_get_master(fsi);
|
struct fsi_master *master = fsi_get_master(fsi);
|
||||||
|
@ -1201,6 +1201,8 @@ static void fsi_pio_start_stop(struct fsi_priv *fsi, struct fsi_stream *io,
|
||||||
|
|
||||||
if (fsi_is_clk_master(fsi))
|
if (fsi_is_clk_master(fsi))
|
||||||
fsi_master_mask_set(master, CLK_RST, clk, (enable) ? clk : 0);
|
fsi_master_mask_set(master, CLK_RST, clk, (enable) ? clk : 0);
|
||||||
|
|
||||||
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int fsi_pio_push_init(struct fsi_priv *fsi, struct fsi_stream *io)
|
static int fsi_pio_push_init(struct fsi_priv *fsi, struct fsi_stream *io)
|
||||||
|
@ -1409,7 +1411,7 @@ static int fsi_dma_transfer(struct fsi_priv *fsi, struct fsi_stream *io)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void fsi_dma_push_start_stop(struct fsi_priv *fsi, struct fsi_stream *io,
|
static int fsi_dma_push_start_stop(struct fsi_priv *fsi, struct fsi_stream *io,
|
||||||
int start)
|
int start)
|
||||||
{
|
{
|
||||||
struct fsi_master *master = fsi_get_master(fsi);
|
struct fsi_master *master = fsi_get_master(fsi);
|
||||||
|
@ -1422,6 +1424,8 @@ static void fsi_dma_push_start_stop(struct fsi_priv *fsi, struct fsi_stream *io,
|
||||||
|
|
||||||
if (fsi_is_clk_master(fsi))
|
if (fsi_is_clk_master(fsi))
|
||||||
fsi_master_mask_set(master, CLK_RST, clk, (enable) ? clk : 0);
|
fsi_master_mask_set(master, CLK_RST, clk, (enable) ? clk : 0);
|
||||||
|
|
||||||
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int fsi_dma_probe(struct fsi_priv *fsi, struct fsi_stream *io, struct device *dev)
|
static int fsi_dma_probe(struct fsi_priv *fsi, struct fsi_stream *io, struct device *dev)
|
||||||
|
|
Загрузка…
Ссылка в новой задаче