diff options
| author |   Fabio Estevam <fabio.estevam@freescale.com> | 2013-01-08 10:45:04 -0200 |
|---|---|---|
| committer |   Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-01-08 17:58:32 +0000 |
| commit | 324a7fb02b9e7a226916e3593f756cd85312bae8 (patch) | |
| tree | 185b24beeda133f8ace4728476eb63fcdb3335ed /sound/soc/mxs/mxs-saif.c | |
| parent | ASoC: mxs-saif: Remove platform data (diff) | |
| download | linux-dev-324a7fb02b9e7a226916e3593f756cd85312bae8.tar.xz linux-dev-324a7fb02b9e7a226916e3593f756cd85312bae8.zip | |
ASoC: mxs-saif: Use a signed integer for error value
saif->id and saif->master_id are unsigned, so they can not be negative.
Fix the following warning when building with W=1 option:
sound/soc/mxs/mxs-saif.c: In function 'mxs_saif_probe':
sound/soc/mxs/mxs-saif.c:676:2: warning: comparison of unsigned expression < 0 is always false [-Wtype-limits]
sound/soc/mxs/mxs-saif.c:688:3: warning: comparison of unsigned expression < 0 is always false [-Wtype-limits]
sound/soc/mxs/mxs-saif.c:692:2: warning: comparison of unsigned expression < 0 is always false [-Wtype-limits]
Use a signed variable 'ret' to handle the error values.
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/mxs/mxs-saif.c')
| -rw-r--r-- | sound/soc/mxs/mxs-saif.c | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/sound/soc/mxs/mxs-saif.c b/sound/soc/mxs/mxs-saif.c index 752675da0658..e70e6c844f96 100644 --- a/sound/soc/mxs/mxs-saif.c +++ b/sound/soc/mxs/mxs-saif.c @@ -672,9 +672,12 @@ static int mxs_saif_probe(struct platform_device *pdev) if (!saif) return -ENOMEM; - saif->id = of_alias_get_id(np, "saif"); - if (saif->id < 0) - return saif->id; + ret = of_alias_get_id(np, "saif"); + if (ret < 0) + return ret; + else + saif->id = ret; + /* * If there is no "fsl,saif-master" phandle, it's a saif * master. Otherwise, it's a slave and its phandle points @@ -684,12 +687,14 @@ static int mxs_saif_probe(struct platform_device *pdev) if (!master) { saif->master_id = saif->id; } else { - saif->master_id = of_alias_get_id(master, "saif"); - if (saif->master_id < 0) - return saif->master_id; + ret = of_alias_get_id(master, "saif"); + if (ret < 0) + return ret; + else + saif->master_id = ret; } - if (saif->master_id < 0 || saif->master_id >= ARRAY_SIZE(mxs_saif)) { + if (saif->master_id >= ARRAY_SIZE(mxs_saif)) { dev_err(&pdev->dev, "get wrong master id\n"); return -EINVAL; } |