Skip to content

Commit

Permalink
spi: Do not print a message if spi_controller_{suspend,resume}() fails
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Geert Uytterhoeven authored and Mark Brown committed Sep 5, 2018
1 parent 35386df commit 7c5d8a2
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 30 deletions.
10 changes: 2 additions & 8 deletions drivers/spi/spi-atmel.c
Original file line number Diff line number Diff line change
Expand Up @@ -1767,10 +1767,8 @@ static int atmel_spi_suspend(struct device *dev)

/* Stop the queue running */
ret = spi_master_suspend(master);
if (ret) {
dev_warn(dev, "cannot suspend master\n");
if (ret)
return ret;
}

if (!pm_runtime_suspended(dev))
atmel_spi_runtime_suspend(dev);
Expand Down Expand Up @@ -1799,11 +1797,7 @@ static int atmel_spi_resume(struct device *dev)
}

/* 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);
}
#endif

Expand Down
7 changes: 1 addition & 6 deletions drivers/spi/spi-dw.c
Original file line number Diff line number Diff line change
Expand Up @@ -572,13 +572,8 @@ EXPORT_SYMBOL_GPL(dw_spi_suspend_host);

int dw_spi_resume_host(struct dw_spi *dws)
{
int ret;

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);

Expand Down
4 changes: 1 addition & 3 deletions drivers/spi/spi-fsl-espi.c
Original file line number Diff line number Diff line change
Expand Up @@ -798,10 +798,8 @@ static int of_fsl_espi_suspend(struct device *dev)
int ret;

ret = spi_master_suspend(master);
if (ret) {
dev_warn(dev, "cannot suspend master\n");
if (ret)
return ret;
}

return pm_runtime_force_suspend(dev);
}
Expand Down
8 changes: 2 additions & 6 deletions drivers/spi/spi-pl022.c
Original file line number Diff line number Diff line change
Expand Up @@ -2325,10 +2325,8 @@ static int pl022_suspend(struct device *dev)
int ret;

ret = spi_master_suspend(pl022->master);
if (ret) {
dev_warn(dev, "cannot suspend master\n");
if (ret)
return ret;
}

ret = pm_runtime_force_suspend(dev);
if (ret) {
Expand All @@ -2353,9 +2351,7 @@ static int pl022_resume(struct device *dev)

/* Start the queue running */
ret = spi_master_resume(pl022->master);
if (ret)
dev_err(dev, "problem starting queue (%d)\n", ret);
else
if (!ret)
dev_dbg(dev, "resumed\n");

return ret;
Expand Down
8 changes: 1 addition & 7 deletions drivers/spi/spi-pxa2xx.c
Original file line number Diff line number Diff line change
Expand Up @@ -1808,13 +1808,7 @@ static int pxa2xx_spi_resume(struct device *dev)
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);
}
#endif

Expand Down

0 comments on commit 7c5d8a2

Please sign in to comment.