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

Commit bc96ba74 authored by Mark Brown's avatar Mark Brown Committed by Linus Torvalds
Browse files

rtc: convert DS1374 to dev_pm_ops 



There is a general move to replace bus-specific PM ops with dev_pm_ops in
order to facilitate core improvements. Do this conversion for DS1374.

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: john stultz <johnstul@us.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent ea611b26

drivers/rtc/rtc-ds1374.c

+13 −6
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <linux/bcd.h>

#include <linux/workqueue.h>

#include <linux/slab.h>

#include <linux/pm.h>



#define DS1374_REG_TOD0		0x00 /* Time of Day */

#define DS1374_REG_TOD1		0x01
@@ -409,32 +410,38 @@ static int __devexit ds1374_remove(struct i2c_client *client) 
}



#ifdef CONFIG_PM

static int ds1374_suspend(struct i2c_client *client, pm_message_t state)

static int ds1374_suspend(struct device *dev)

{

	struct i2c_client *client = to_i2c_client(dev);



	if (client->irq >= 0 && device_may_wakeup(&client->dev))

		enable_irq_wake(client->irq);

	return 0;

}



static int ds1374_resume(struct i2c_client *client)

static int ds1374_resume(struct device *dev)

{

	struct i2c_client *client = to_i2c_client(dev);



	if (client->irq >= 0 && device_may_wakeup(&client->dev))

		disable_irq_wake(client->irq);

	return 0;

}



static SIMPLE_DEV_PM_OPS(ds1374_pm, ds1374_suspend, ds1374_resume);



#define DS1374_PM (&ds1374_pm)

#else

#define ds1374_suspend	NULL

#define ds1374_resume	NULL

#define DS1374_PM NULL

#endif



static struct i2c_driver ds1374_driver = {

	.driver = {

		.name = "rtc-ds1374",

		.owner = THIS_MODULE,

		.pm = DS1374_PM,

	},

	.probe = ds1374_probe,

	.suspend = ds1374_suspend,

	.resume = ds1374_resume,

	.remove = __devexit_p(ds1374_remove),

	.id_table = ds1374_id,

};