AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

spi/dln2: simplify return flow for dln2_spi_transfer_setup and dln2_spi_enable

Browse Source 
This fixes the following kbuild test robot warnings:

>> drivers/spi/spi-dln2.c:124:1-4: WARNING: end returns can be simplified if negative or 0 value
>> drivers/spi/spi-dln2.c:656:1-4: WARNING: end returns can be simplified if negative or 0 value

Additionally, fix a comment after switching from CONFIG_PM_RUNTIME to
CONFIG_PM.

Reported-by: Julia Lawall <julia.lawall@lip6.fr>
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Laurentiu Palcu 2015-01-06 15:23:40 +02:00 committed by Mark Brown
parent b2e5dda14f
commit 2b5e368e41
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/spi/spi-dln2.c
View File

@ -103,7 +103,6 @@ struct dln2_spi {
*/
static int dln2_spi_enable(struct dln2_spi *dln2, bool enable)
{
int ret;
u16 cmd;
struct {
u8 port;
@ -121,11 +120,7 @@ static int dln2_spi_enable(struct dln2_spi *dln2, bool enable)
cmd = DLN2_SPI_DISABLE;
}
ret = dln2_transfer_tx(dln2->pdev, cmd, &tx, len);
if (ret < 0)
return ret;
return 0;
return dln2_transfer_tx(dln2->pdev, cmd, &tx, len);
}
/*
@ -653,11 +648,7 @@ static int dln2_spi_transfer_setup(struct dln2_spi *dln2, u32 speed,
dln2->bpw = bpw;
}
ret = dln2_spi_enable(dln2, true);
if (ret < 0)
return ret;
return 0;
return dln2_spi_enable(dln2, true);
}
static int dln2_spi_transfer_one(struct spi_master *master,
@ -866,7 +857,7 @@ static int dln2_spi_runtime_resume(struct device *dev)
return dln2_spi_enable(dln2, true);
}
#endif /* CONFIG_PM_RUNTIME */
#endif /* CONFIG_PM */
static const struct dev_pm_ops dln2_spi_pm = {
SET_SYSTEM_SLEEP_PM_OPS(dln2_spi_suspend, dln2_spi_resume)