Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ec60dd37 authored by Jingoo Han's avatar Jingoo Han Committed by Mark Brown
Browse files

spi: atmel: convert from legacy pm ops to dev_pm_ops 



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: default avatarJingoo Han <jg1.han@samsung.com>
Acked-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 272b98c6

drivers/spi/spi-atmel.c

+11 −11
Original line number Diff line number Diff line
@@ -1675,29 +1675,30 @@ static int atmel_spi_remove(struct platform_device *pdev) 
	return 0;

}



#ifdef	CONFIG_PM



static int atmel_spi_suspend(struct platform_device *pdev, pm_message_t mesg)

#ifdef CONFIG_PM_SLEEP

static int atmel_spi_suspend(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);



	clk_disable_unprepare(as->clk);

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



	return clk_prepare_enable(as->clk);

	clk_prepare_enable(as->clk);

	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

#define	atmel_spi_suspend	NULL

#define	atmel_spi_resume	NULL

#define ATMEL_SPI_PM_OPS	NULL

#endif



#if defined(CONFIG_OF)
@@ -1713,10 +1714,9 @@ static struct platform_driver atmel_spi_driver = { 
	.driver		= {

		.name	= "atmel_spi",

		.owner	= THIS_MODULE,

		.pm	= ATMEL_SPI_PM_OPS,

		.of_match_table	= of_match_ptr(atmel_spi_dt_ids),

	},

	.suspend	= atmel_spi_suspend,

	.resume		= atmel_spi_resume,

	.probe		= atmel_spi_probe,

	.remove		= atmel_spi_remove,

};