On 02/11/2011 04:13 PM, Mark Brown wrote:
> There is a general move to convert drivers to use dev_pm_ops rather than
> bus specific PM operations in order to facilitate core work. Do this
> conversion for ad714x-i2c.
>
> Signed-off-by: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
>
Acked-by: Michael Hennerich <michael.hennerich@xxxxxxxxxx>
> ---
> drivers/input/misc/ad714x-i2c.c | 17 ++++++++---------
> 1 files changed, 8 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/input/misc/ad714x-i2c.c b/drivers/input/misc/ad714x-i2c.c
> index 2bef8fa..e21deb1 100644
> --- a/drivers/input/misc/ad714x-i2c.c
> +++ b/drivers/input/misc/ad714x-i2c.c
> @@ -10,23 +10,23 @@
> #include <linux/i2c.h>
> #include <linux/module.h>
> #include <linux/types.h>
> +#include <linux/pm.h>
> #include "ad714x.h"
>
> #ifdef CONFIG_PM
> -static int ad714x_i2c_suspend(struct i2c_client *client, pm_message_t message)
> +static int ad714x_i2c_suspend(struct device *dev)
> {
> - return ad714x_disable(i2c_get_clientdata(client));
> + return ad714x_disable(i2c_get_clientdata(to_i2c_client(dev)));
> }
>
> -static int ad714x_i2c_resume(struct i2c_client *client)
> +static int ad714x_i2c_resume(struct device *dev)
> {
> - return ad714x_enable(i2c_get_clientdata(client));
> + return ad714x_enable(i2c_get_clientdata(to_i2c_client(dev)));
> }
> -#else
> -# define ad714x_i2c_suspend NULL
> -# define ad714x_i2c_resume NULL
> #endif
>
> +static SIMPLE_DEV_PM_OPS(ad714x_i2c_pm, ad714x_i2c_suspend, ad714x_i2c_resume);
> +
> static int ad714x_i2c_write(struct device *dev, unsigned short reg,
> unsigned short data)
> {
> @@ -114,11 +114,10 @@ MODULE_DEVICE_TABLE(i2c, ad714x_id);
> static struct i2c_driver ad714x_i2c_driver = {
> .driver = {
> .name = "ad714x_captouch",
> + .pm = &ad714x_i2c_pm,
> },
> .probe = ad714x_i2c_probe,
> .remove = __devexit_p(ad714x_i2c_remove),
> - .suspend = ad714x_i2c_suspend,
> - .resume = ad714x_i2c_resume,
> .id_table = ad714x_id,
> };
>
>
--
Greetings,
Michael
--
Analog Devices GmbH Wilhelm-Wagenfeld-Str. 6 80807 Muenchen
Sitz der Gesellschaft: Muenchen; Registergericht: Muenchen HRB 40368;
Geschaeftsfuehrer:Dr.Carsten Suckrow, Thomas Wessel, William A. Martin,
Margaret Seif
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
