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

Commit 6a6c6189 authored by Magnus Damm's avatar Magnus Damm Committed by Rafael J. Wysocki
Browse files

I2C: Rework i2c-s3c2410 suspend_late()/resume() V2 



This is V2 of the i2c-s3c2410 dev_pm_ops patch.

The callbacks are converted for CONFIG_SUSPEND like this:
  suspend_late() -> suspend_noirq()
  resume() -> resume()

Signed-off-by: default avatarMagnus Damm <damm@igel.co.jp>
Acked-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
Acked-by: default avatarPavel Machek <pavel@ucw.cz>
Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
parent 57f4d4f1

drivers/i2c/busses/i2c-s3c2410.c

+16 −9
Original line number Diff line number Diff line
@@ -951,17 +951,20 @@ static int s3c24xx_i2c_remove(struct platform_device *pdev) 
}



#ifdef CONFIG_PM

static int s3c24xx_i2c_suspend_late(struct platform_device *dev,

				    pm_message_t msg)

static int s3c24xx_i2c_suspend_noirq(struct device *dev)

{

	struct s3c24xx_i2c *i2c = platform_get_drvdata(dev);

	struct platform_device *pdev = to_platform_device(dev);

	struct s3c24xx_i2c *i2c = platform_get_drvdata(pdev);



	i2c->suspended = 1;



	return 0;

}



static int s3c24xx_i2c_resume(struct platform_device *dev)

static int s3c24xx_i2c_resume(struct device *dev)

{

	struct s3c24xx_i2c *i2c = platform_get_drvdata(dev);

	struct platform_device *pdev = to_platform_device(dev);

	struct s3c24xx_i2c *i2c = platform_get_drvdata(pdev);



	i2c->suspended = 0;

	s3c24xx_i2c_init(i2c);
@@ -969,9 +972,14 @@ static int s3c24xx_i2c_resume(struct platform_device *dev) 
	return 0;

}



static struct dev_pm_ops s3c24xx_i2c_dev_pm_ops = {

	.suspend_noirq = s3c24xx_i2c_suspend_noirq,

	.resume = s3c24xx_i2c_resume,

};



#define S3C24XX_DEV_PM_OPS (&s3c24xx_i2c_dev_pm_ops)

#else

#define s3c24xx_i2c_suspend_late NULL

#define s3c24xx_i2c_resume NULL

#define S3C24XX_DEV_PM_OPS NULL

#endif



/* device driver for platform bus bits */
@@ -990,12 +998,11 @@ MODULE_DEVICE_TABLE(platform, s3c24xx_driver_ids); 
static struct platform_driver s3c24xx_i2c_driver = {

	.probe		= s3c24xx_i2c_probe,

	.remove		= s3c24xx_i2c_remove,

	.suspend_late	= s3c24xx_i2c_suspend_late,

	.resume		= s3c24xx_i2c_resume,

	.id_table	= s3c24xx_driver_ids,

	.driver		= {

		.owner	= THIS_MODULE,

		.name	= "s3c-i2c",

		.pm	= S3C24XX_DEV_PM_OPS,

	},

};