spi_controller_{suspend,resume}() already prints an error message on
failure, so there is no need to repeat this in individual drivers.
Note: spi_master_{suspend,resume}() is an alias for
spi_controller_{suspend,resume}().
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Reviewed-by: Daniel Mack <daniel@zonque.org>
Acked-by: Nicolas Ferre <nicolas.ferre@microchip.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
/* Stop the queue running */
ret = spi_master_suspend(master);
/* Stop the queue running */
ret = spi_master_suspend(master);
- if (ret) {
- dev_warn(dev, "cannot suspend master\n");
if (!pm_runtime_suspended(dev))
atmel_spi_runtime_suspend(dev);
if (!pm_runtime_suspended(dev))
atmel_spi_runtime_suspend(dev);
}
/* Start the queue running */
}
/* Start the queue running */
- ret = spi_master_resume(master);
- if (ret)
- dev_err(dev, "problem starting queue (%d)\n", ret);
-
- return ret;
+ return spi_master_resume(master);
int dw_spi_resume_host(struct dw_spi *dws)
{
int dw_spi_resume_host(struct dw_spi *dws)
{
spi_hw_init(&dws->master->dev, dws);
spi_hw_init(&dws->master->dev, dws);
- ret = spi_controller_resume(dws->master);
- if (ret)
- dev_err(&dws->master->dev, "fail to start queue (%d)\n", ret);
- return ret;
+ return spi_controller_resume(dws->master);
}
EXPORT_SYMBOL_GPL(dw_spi_resume_host);
}
EXPORT_SYMBOL_GPL(dw_spi_resume_host);
int ret;
ret = spi_master_suspend(master);
int ret;
ret = spi_master_suspend(master);
- if (ret) {
- dev_warn(dev, "cannot suspend master\n");
return pm_runtime_force_suspend(dev);
}
return pm_runtime_force_suspend(dev);
}
int ret;
ret = spi_master_suspend(pl022->master);
int ret;
ret = spi_master_suspend(pl022->master);
- if (ret) {
- dev_warn(dev, "cannot suspend master\n");
ret = pm_runtime_force_suspend(dev);
if (ret) {
ret = pm_runtime_force_suspend(dev);
if (ret) {
/* Start the queue running */
ret = spi_master_resume(pl022->master);
/* Start the queue running */
ret = spi_master_resume(pl022->master);
- if (ret)
- dev_err(dev, "problem starting queue (%d)\n", ret);
- else
dev_dbg(dev, "resumed\n");
return ret;
dev_dbg(dev, "resumed\n");
return ret;
lpss_ssp_setup(drv_data);
/* Start the queue running */
lpss_ssp_setup(drv_data);
/* Start the queue running */
- status = spi_controller_resume(drv_data->master);
- if (status != 0) {
- dev_err(dev, "problem starting queue (%d)\n", status);
- return status;
- }
-
- return 0;
+ return spi_controller_resume(drv_data->master);