| From 9f9c72893ff250d6f5846c862c0454559e9e5005 Mon Sep 17 00:00:00 2001 |
| From: Mark Brown <broonie@linaro.org> |
| Date: Sun, 28 Jul 2013 15:36:38 +0100 |
| Subject: spi/sh-msiof: Remove unneeded empty runtime PM callbacks |
| |
| Previously the runtime PM API insisted on having callbacks for everything |
| but this requirement was removed a while ago so the empty callbacks can |
| also be removed. |
| |
| Signed-off-by: Mark Brown <broonie@linaro.org> |
| (cherry picked from commit 33bf2c0b7d5af73763f41fd10d18f4c1f574c7fb) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/spi/spi-sh-msiof.c | 18 ------------------ |
| 1 file changed, 18 deletions(-) |
| |
| diff --git a/drivers/spi/spi-sh-msiof.c b/drivers/spi/spi-sh-msiof.c |
| index 2bc5a6b86300..6688ce78df78 100644 |
| --- a/drivers/spi/spi-sh-msiof.c |
| +++ b/drivers/spi/spi-sh-msiof.c |
| @@ -745,18 +745,6 @@ static int sh_msiof_spi_remove(struct platform_device *pdev) |
| return ret; |
| } |
| |
| -static int sh_msiof_spi_runtime_nop(struct device *dev) |
| -{ |
| - /* Runtime PM callback shared between ->runtime_suspend() |
| - * and ->runtime_resume(). Simply returns success. |
| - * |
| - * This driver re-initializes all registers after |
| - * pm_runtime_get_sync() anyway so there is no need |
| - * to save and restore registers here. |
| - */ |
| - return 0; |
| -} |
| - |
| #ifdef CONFIG_OF |
| static const struct of_device_id sh_msiof_match[] = { |
| { .compatible = "renesas,sh-msiof", }, |
| @@ -766,18 +754,12 @@ static const struct of_device_id sh_msiof_match[] = { |
| MODULE_DEVICE_TABLE(of, sh_msiof_match); |
| #endif |
| |
| -static struct dev_pm_ops sh_msiof_spi_dev_pm_ops = { |
| - .runtime_suspend = sh_msiof_spi_runtime_nop, |
| - .runtime_resume = sh_msiof_spi_runtime_nop, |
| -}; |
| - |
| static struct platform_driver sh_msiof_spi_drv = { |
| .probe = sh_msiof_spi_probe, |
| .remove = sh_msiof_spi_remove, |
| .driver = { |
| .name = "spi_sh_msiof", |
| .owner = THIS_MODULE, |
| - .pm = &sh_msiof_spi_dev_pm_ops, |
| .of_match_table = of_match_ptr(sh_msiof_match), |
| }, |
| }; |
| -- |
| 1.8.5.rc3 |
| |
