From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sven Neumann Subject: Re: [PATCH] Input: eeti_ts - Convert to dev_pm_ops Date: Thu, 06 Jan 2011 10:52:52 +0100 Message-ID: <1294307572.2218.1.camel@sven> References: <1294254361-26066-1-git-send-email-broonie@opensource.wolfsonmicro.com> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit Return-path: Received: from vwp2514.webpack.hosteurope.de ([87.230.42.24]:51895 "EHLO vwp2514.webpack.hosteurope.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752423Ab1AFKNn (ORCPT ); Thu, 6 Jan 2011 05:13:43 -0500 In-Reply-To: <1294254361-26066-1-git-send-email-broonie@opensource.wolfsonmicro.com> Sender: linux-input-owner@vger.kernel.org List-Id: linux-input@vger.kernel.org To: Mark Brown Cc: Daniel Mack , Dmitry Torokhov , linux-input@vger.kernel.org On Wed, 2011-01-05 at 19:06 +0000, Mark Brown wrote: > There is a general move towards the use of dev_pm_ops rather than > bus specific suspend APIs as this simplifies both the bus and PM core > implementations. Convert the eeti_ts driver over. > > Compile tested only. > > Signed-off-by: Mark Brown > --- Tested-by: Sven Neumann > drivers/input/touchscreen/eeti_ts.c | 14 ++++++++------ > 1 files changed, 8 insertions(+), 6 deletions(-) > > diff --git a/drivers/input/touchscreen/eeti_ts.c b/drivers/input/touchscreen/eeti_ts.c > index 7a3a916..1f0ef91 100644 > --- a/drivers/input/touchscreen/eeti_ts.c > +++ b/drivers/input/touchscreen/eeti_ts.c > @@ -261,8 +261,9 @@ static int __devexit eeti_ts_remove(struct i2c_client *client) > } > > #ifdef CONFIG_PM > -static int eeti_ts_suspend(struct i2c_client *client, pm_message_t mesg) > +static int eeti_ts_suspend(struct device *dev) > { > + struct i2c_client *client = to_i2c_client(dev); > struct eeti_ts_priv *priv = i2c_get_clientdata(client); > struct input_dev *input_dev = priv->input; > > @@ -279,8 +280,9 @@ static int eeti_ts_suspend(struct i2c_client *client, pm_message_t mesg) > return 0; > } > > -static int eeti_ts_resume(struct i2c_client *client) > +static int eeti_ts_resume(struct device *dev) > { > + struct i2c_client *client = to_i2c_client(dev); > struct eeti_ts_priv *priv = i2c_get_clientdata(client); > struct input_dev *input_dev = priv->input; > > @@ -296,9 +298,10 @@ static int eeti_ts_resume(struct i2c_client *client) > > return 0; > } > + > +static SIMPLE_DEV_PM_OPS(eeti_ts_pm, eeti_ts_suspend, eeti_ts_resume); > #else > -#define eeti_ts_suspend NULL > -#define eeti_ts_resume NULL > +#define eeti_ts_pm NULL > #endif > > static const struct i2c_device_id eeti_ts_id[] = { > @@ -310,11 +313,10 @@ MODULE_DEVICE_TABLE(i2c, eeti_ts_id); > static struct i2c_driver eeti_ts_driver = { > .driver = { > .name = "eeti_ts", > + .pm = &eeti_ts_pm, > }, > .probe = eeti_ts_probe, > .remove = __devexit_p(eeti_ts_remove), > - .suspend = eeti_ts_suspend, > - .resume = eeti_ts_resume, > .id_table = eeti_ts_id, > }; >