mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-30 22:26:55 +00:00
Code Issues Releases Wiki Activity

spi: mt65xx: Move pm_runtime_enable() call to remove all gotos

Browse source 
The last goto in the probe function can be removed by calling
pm_runtime_enable() right before devm_spi_register_master(), as
only some init checks were being performed after enabling pm.
This is a cleanup and brings no functional changes.

Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Link: https://lore.kernel.org/r/20220407114428.167091-6-angelogioacchino.delregno@collabora.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
AngeloGioacchino Del Regno 2022-04-07 13:44:25 +02:00 committed by Mark Brown
parent 5dee8bb8d1
commit 5088b31364
No known key found for this signature in database
GPG key ID: 24D68B725D5487D0
1 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
drivers/spi/spi-mt65xx.c
View file

@ -1224,22 +1224,18 @@ static int mtk_spi_probe(struct platform_device *pdev)
clk_disable_unprepare(mdata->spi_hclk);
}
pm_runtime_enable(dev);
if (mdata->dev_comp->need_pad_sel) {
if (mdata->pad_num != master->num_chipselect) {
dev_err(dev,
"pad_num does not match num_chipselect(%d != %d)\n",
mdata->pad_num, master->num_chipselect);
ret = -EINVAL;
goto err_disable_runtime_pm;
return -EINVAL;
}
if (!master->cs_gpiods && master->num_chipselect > 1) {
dev_err(dev,
"cs_gpios not specified and num_chipselect > 1\n");
ret = -EINVAL;
goto err_disable_runtime_pm;
return -EINVAL;
}
}
@ -1252,18 +1248,16 @@ static int mtk_spi_probe(struct platform_device *pdev)
dev_notice(dev, "SPI dma_set_mask(%d) failed, ret:%d\n",
addr_bits, ret);
pm_runtime_enable(dev);
ret = devm_spi_register_master(dev, master);
if (ret) {
pm_runtime_disable(dev);
dev_err(dev, "failed to register master (%d)\n", ret);
goto err_disable_runtime_pm;
return ret;
}
return 0;
err_disable_runtime_pm:
pm_runtime_disable(dev);
return ret;
}
static int mtk_spi_remove(struct platform_device *pdev)