mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-14 06:30:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

staging/olpc_dcon: use s/r hooks from device_driver->pm

Browse Source 
..instead of the i2c_driver hooks.  This should silence the following
runtime warnings:

[   17.820321] i2c-core: driver [olpc_dcon] using legacy suspend method
[   17.846082] i2c-core: driver [olpc_dcon] using legacy resume method

Signed-off-by: Andres Salomon <dilinger@queued.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Andres Salomon
2012-10-01 14:46:21 -07:00
committed by Greg Kroah-Hartman
parent 6c98274cba
commit 3e5e624bfd
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/staging/olpc_dcon/olpc_dcon.c
View File

@@ -685,8 +685,9 @@ static int dcon_remove(struct i2c_client *client)
}
#ifdef CONFIG_PM
static int dcon_suspend(struct i2c_client *client, pm_message_t state)
static int dcon_suspend(struct device *dev)
{
struct i2c_client *client = to_i2c_client(dev);
struct dcon_priv *dcon = i2c_get_clientdata(client);
if (!dcon->asleep) {
@@ -697,8 +698,9 @@ static int dcon_suspend(struct i2c_client *client, pm_message_t state)
return 0;
}
static int dcon_resume(struct i2c_client *client)
static int dcon_resume(struct device *dev)
{
struct i2c_client *client = to_i2c_client(dev);
struct dcon_priv *dcon = i2c_get_clientdata(client);
if (!dcon->asleep) {
@@ -709,7 +711,12 @@ static int dcon_resume(struct i2c_client *client)
return 0;
}
#endif
#else
#define dcon_suspend NULL
#define dcon_resume NULL
#endif /* CONFIG_PM */
irqreturn_t dcon_interrupt(int irq, void *id)
@@ -753,16 +760,21 @@ irqreturn_t dcon_interrupt(int irq, void *id)
return IRQ_HANDLED;
}
static const struct dev_pm_ops dcon_pm_ops = {
.suspend = dcon_suspend,
.resume = dcon_resume,
};
static const struct i2c_device_id dcon_idtable[] = {
{ "olpc_dcon", 0 },
{ }
};
MODULE_DEVICE_TABLE(i2c, dcon_idtable);
struct i2c_driver dcon_driver = {
.driver = {
.name = "olpc_dcon",
.pm = &dcon_pm_ops,
},
.class = I2C_CLASS_DDC | I2C_CLASS_HWMON,
.id_table = dcon_idtable,
@@ -770,10 +782,6 @@ struct i2c_driver dcon_driver = {
.remove = __devexit_p(dcon_remove),
.detect = dcon_detect,
.address_list = normal_i2c,
#ifdef CONFIG_PM
.suspend = dcon_suspend,
.resume = dcon_resume,
#endif
};
static int __init olpc_dcon_init(void)