iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

spi: atmel: convert from legacy pm ops to dev_pm_ops

Browse Source 
Instead of using legacy suspend/resume methods, using newer
dev_pm_ops structure allows better control over power management.
Also, duplicated 'return' is removed from atmel_spi_resume().

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
This commit is contained in:
Jingoo Han 2013-09-09 17:54:12 +09:00 committed by Mark Brown
parent 272b98c645
commit ec60dd37e1
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/spi/spi-atmel.c
View File

@ -1675,29 +1675,30 @@ static int atmel_spi_remove(struct platform_device *pdev)
return 0; return 0;
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
static int atmel_spi_suspend(struct device *dev)
static int atmel_spi_suspend(struct platform_device *pdev, pm_message_t mesg)
{ {
struct spi_master *master = platform_get_drvdata(pdev); struct spi_master *master = dev_get_drvdata(dev);
struct atmel_spi *as = spi_master_get_devdata(master); struct atmel_spi *as = spi_master_get_devdata(master);
clk_disable_unprepare(as->clk); clk_disable_unprepare(as->clk);
return 0; return 0;
} }
static int atmel_spi_resume(struct platform_device *pdev) static int atmel_spi_resume(struct device *dev)
{ {
struct spi_master *master = platform_get_drvdata(pdev); struct spi_master *master = dev_get_drvdata(dev);
struct atmel_spi *as = spi_master_get_devdata(master); struct atmel_spi *as = spi_master_get_devdata(master);
return clk_prepare_enable(as->clk); clk_prepare_enable(as->clk);
return 0; return 0;
} }
static SIMPLE_DEV_PM_OPS(atmel_spi_pm_ops, atmel_spi_suspend, atmel_spi_resume);
#define ATMEL_SPI_PM_OPS (&atmel_spi_pm_ops)
#else #else
#define atmel_spi_suspend NULL #define ATMEL_SPI_PM_OPS NULL
#define atmel_spi_resume NULL
#endif #endif
#if defined(CONFIG_OF) #if defined(CONFIG_OF)
@ -1713,10 +1714,9 @@ static struct platform_driver atmel_spi_driver = {
.driver = { .driver = {
.name = "atmel_spi", .name = "atmel_spi",
.owner = THIS_MODULE, .owner = THIS_MODULE,
.pm = ATMEL_SPI_PM_OPS,
.of_match_table = of_match_ptr(atmel_spi_dt_ids), .of_match_table = of_match_ptr(atmel_spi_dt_ids),
}, },
.suspend = atmel_spi_suspend,
.resume = atmel_spi_resume,
.probe = atmel_spi_probe, .probe = atmel_spi_probe,
.remove = atmel_spi_remove, .remove = atmel_spi_remove,
}; };