Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Input: st1232 - switch to using SIMPLE_DEV_PM_OPS

Acked-by: Rafael J. Wysocki <rjw@sisk.pl>
Reviewed-by: Simon Horman <horms@verge.net.au>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

+4 -7
+4 -7
drivers/input/touchscreen/st1232.c
··· 218 218 return 0; 219 219 } 220 220 221 - #ifdef CONFIG_PM 221 + #ifdef CONFIG_PM_SLEEP 222 222 static int st1232_ts_suspend(struct device *dev) 223 223 { 224 224 struct i2c_client *client = to_i2c_client(dev); ··· 243 243 return 0; 244 244 } 245 245 246 - static const struct dev_pm_ops st1232_ts_pm_ops = { 247 - .suspend = st1232_ts_suspend, 248 - .resume = st1232_ts_resume, 249 - }; 250 246 #endif 247 + 248 + static SIMPLE_DEV_PM_OPS(st1232_ts_pm_ops, 249 + st1232_ts_suspend, st1232_ts_resume); 251 250 252 251 static const struct i2c_device_id st1232_ts_id[] = { 253 252 { ST1232_TS_NAME, 0 }, ··· 270 271 .name = ST1232_TS_NAME, 271 272 .owner = THIS_MODULE, 272 273 .of_match_table = of_match_ptr(st1232_ts_dt_ids), 273 - #ifdef CONFIG_PM 274 274 .pm = &st1232_ts_pm_ops, 275 - #endif 276 275 }, 277 276 }; 278 277