Commit c375b2d7eff01d6423b95b2d44e8466beae0a15a
Committed by
Mark Brown
Mark Brown
1 parent
e4aa937ec7
Exists in
smarc-imx_3.14.28_1.0.0_ga
and in
1 other branch
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>
Showing 1 changed file with 7 additions and 3 deletions Side-by-side Diff
sound/soc/sh/fsi.c
| ... | ... | @@ -276,7 +276,7 @@ |
| 276 | 276 | int (*probe)(struct fsi_priv *fsi, struct fsi_stream *io, struct device *dev); |
| 277 | 277 | int (*transfer)(struct fsi_priv *fsi, struct fsi_stream *io); |
| 278 | 278 | int (*remove)(struct fsi_priv *fsi, struct fsi_stream *io); |
| 279 | - void (*start_stop)(struct fsi_priv *fsi, struct fsi_stream *io, | |
| 279 | + int (*start_stop)(struct fsi_priv *fsi, struct fsi_stream *io, | |
| 280 | 280 | int enable); |
| 281 | 281 | }; |
| 282 | 282 | #define fsi_stream_handler_call(io, func, args...) \ |
| ... | ... | @@ -1188,7 +1188,7 @@ |
| 1188 | 1188 | samples); |
| 1189 | 1189 | } |
| 1190 | 1190 | |
| 1191 | -static void fsi_pio_start_stop(struct fsi_priv *fsi, struct fsi_stream *io, | |
| 1191 | +static int fsi_pio_start_stop(struct fsi_priv *fsi, struct fsi_stream *io, | |
| 1192 | 1192 | int enable) |
| 1193 | 1193 | { |
| 1194 | 1194 | struct fsi_master *master = fsi_get_master(fsi); |
| ... | ... | @@ -1201,6 +1201,8 @@ |
| 1201 | 1201 | |
| 1202 | 1202 | if (fsi_is_clk_master(fsi)) |
| 1203 | 1203 | fsi_master_mask_set(master, CLK_RST, clk, (enable) ? clk : 0); |
| 1204 | + | |
| 1205 | + return 0; | |
| 1204 | 1206 | } |
| 1205 | 1207 | |
| 1206 | 1208 | static int fsi_pio_push_init(struct fsi_priv *fsi, struct fsi_stream *io) |
| ... | ... | @@ -1409,7 +1411,7 @@ |
| 1409 | 1411 | return 0; |
| 1410 | 1412 | } |
| 1411 | 1413 | |
| 1412 | -static void fsi_dma_push_start_stop(struct fsi_priv *fsi, struct fsi_stream *io, | |
| 1414 | +static int fsi_dma_push_start_stop(struct fsi_priv *fsi, struct fsi_stream *io, | |
| 1413 | 1415 | int start) |
| 1414 | 1416 | { |
| 1415 | 1417 | struct fsi_master *master = fsi_get_master(fsi); |
| ... | ... | @@ -1422,6 +1424,8 @@ |
| 1422 | 1424 | |
| 1423 | 1425 | if (fsi_is_clk_master(fsi)) |
| 1424 | 1426 | fsi_master_mask_set(master, CLK_RST, clk, (enable) ? clk : 0); |
| 1427 | + | |
| 1428 | + return 0; | |
| 1425 | 1429 | } |
| 1426 | 1430 | |
| 1427 | 1431 | static int fsi_dma_probe(struct fsi_priv *fsi, struct fsi_stream *io, struct device *dev) |