mbox series

[00/16] Input: Switch to new PM macros set 3

Message ID 20230114171620.42891-1-jic23@kernel.org
Headers show
Series Input: Switch to new PM macros set 3 | expand

Message

Jonathan Cameron Jan. 14, 2023, 5:16 p.m. UTC
From: Jonathan Cameron <Jonathan.Cameron@huawei.com>

Continuation of
https://lore.kernel.org/all/20230102181842.718010-1-jic23@kernel.org/

This time we have most of the remaining drivers where the changes needed
are more complex than the earlier straight conversions.

A separate series will deal with pm80x as the cleanup for that will
extend to MFD and RTC trees and cannot easily be broken up due to
some changes in exports.

There is a general mixture of cases in here:
1) More complex direct conversions - typically drivers with separate
   sleep and runtime pm ops.
2) Cases where the callbacks or struct dev_pm_ops is exported to
   multiple modules.
3) Refactors that avoid duplication of callbacks or exports.
4) A tweak to the core input handling to use the new macros - this
   is different from the driver changes, but seemed sensible.

Note there are a few cases in here where I a much more minimal
set of callbacks is provided than DEFINE_SIMPLE_DEV_PM_OPS() and
friends would set. I don't know the history behind those so whilst
they might well be fine converted to the generic macros, I've
left them alone.

Cc: Hans de Goede <hdegoede@redhat.com>
Cc: Caleb Connolly <caleb@connolly.tech>
Cc: Andi Shyti <andi@etezian.org>
Cc: Matthias Schiffer <matthias.schiffer@ew.tq-group.com>
Cc: Lyude Paul <lyude@redhat.com>
Cc: Andrew Duggan <aduggan@synaptics.com>
Cc: Michael Hennerich <michael.hennerich@analog.com>
Cc: Javier Martinez Canillas <javier@dowhile0.org>
Cc: Linus Walleij <linus.walleij@linaro.org>

Jonathan Cameron (16):
  Input: cyapa - switch to SYSTEM_SLEEP/RUNTIME_PM_OPS() and pm_ptr()
  Input: axp20x-pek - switch to SYSTEM_SLEEP_PM_OPS() and pm_sleep_ptr()
  Input: samsung-keypad - switch to pm_ptr() and
    SYSTEM_SLEEP/RUNTIME_PM_OPS()
  Input: s6sy761 - switch to SYSTEM_SLEEP_/RUNTIME_PM_OPS() and pm_ptr()
  Input: rmi4 - switch to SYSTEM_SLEEP/RUNTIME_PM_OPS() and pm_ptr()
  Input: stmfts - switch to SYSTEM_SLEEP_/RUNTIME_PM_OPS() and pm_ptr()
  Input: ad714x - unify dev_pm_ops using EXPORT_SIMPLE_DEV_PM_OPS()
  Input: adxl34x - unify dev_pm_ops using EXPORT_SIMPLE_DEV_PM_OPS()
  Input: tsc200x - use EXPORT_GPL_SIMPLE_DEV_PM_OPS()
  Input: cyttsp4 - use EXPORT_GPL_RUNTIME_DEV_PM_OPS()
  Input: cyttsp - use EXPORT_GPL_SIMPLE_DEV_PM_OPS()
  Input: applespi - use pm_sleep_ptr() and SYSTEM_SLEEP_PM_OPS()
  Input: omap4-keyad - use pm_ptr() and RUNTIME_DEV_PM_OPS()
  Input: Use pm_sleep_ptr() to avoid need for ifdef CONFIG_PM_SLEEP
  Input: cma3000 - use pm_sleep_ptr() to allow removal of ifdef
    CONFIG_PM guards
  Input: wistron_btns -  use pm_sleep_ptr() to allow removal of ifdef
    CONFIG_PM guards

 drivers/input/input.c                    |  7 ++-----
 drivers/input/keyboard/applespi.c        | 10 +++++-----
 drivers/input/keyboard/omap4-keypad.c    |  6 +++---
 drivers/input/keyboard/samsung-keypad.c  | 12 ++++--------
 drivers/input/misc/ad714x-i2c.c          | 14 +------------
 drivers/input/misc/ad714x-spi.c          | 14 +------------
 drivers/input/misc/ad714x.c              | 12 ++++++------
 drivers/input/misc/ad714x.h              |  4 ++--
 drivers/input/misc/adxl34x-i2c.c         | 25 +-----------------------
 drivers/input/misc/adxl34x-spi.c         | 25 +-----------------------
 drivers/input/misc/adxl34x.c             | 16 +++++++++++----
 drivers/input/misc/adxl34x.h             |  4 ++--
 drivers/input/misc/axp20x-pek.c          | 12 +++++-------
 drivers/input/misc/cma3000_d0x_i2c.c     |  6 +-----
 drivers/input/misc/wistron_btns.c        |  6 +-----
 drivers/input/mouse/cyapa.c              | 14 ++++++-------
 drivers/input/rmi4/rmi_i2c.c             | 11 +++--------
 drivers/input/rmi4/rmi_smbus.c           | 15 +++++++-------
 drivers/input/rmi4/rmi_spi.c             | 11 +++--------
 drivers/input/touchscreen/cyttsp4_core.c |  9 ++-------
 drivers/input/touchscreen/cyttsp4_i2c.c  |  2 +-
 drivers/input/touchscreen/cyttsp4_spi.c  |  2 +-
 drivers/input/touchscreen/cyttsp_core.c  |  7 +++----
 drivers/input/touchscreen/cyttsp_i2c.c   |  2 +-
 drivers/input/touchscreen/cyttsp_spi.c   |  2 +-
 drivers/input/touchscreen/s6sy761.c      | 15 +++++++-------
 drivers/input/touchscreen/stmfts.c       | 14 ++++++-------
 drivers/input/touchscreen/tsc2004.c      |  2 +-
 drivers/input/touchscreen/tsc2005.c      |  2 +-
 drivers/input/touchscreen/tsc200x-core.c |  7 +++----
 30 files changed, 95 insertions(+), 193 deletions(-)

Comments

Dmitry Torokhov Jan. 27, 2023, 10:50 p.m. UTC | #1
On Sat, Jan 14, 2023 at 05:16:04PM +0000, Jonathan Cameron wrote:
> From: Jonathan Cameron <Jonathan.Cameron@huawei.com>
> 
> Continuation of
> https://lore.kernel.org/all/20230102181842.718010-1-jic23@kernel.org/
> 
> This time we have most of the remaining drivers where the changes needed
> are more complex than the earlier straight conversions.
> 
> A separate series will deal with pm80x as the cleanup for that will
> extend to MFD and RTC trees and cannot easily be broken up due to
> some changes in exports.
> 
> There is a general mixture of cases in here:
> 1) More complex direct conversions - typically drivers with separate
>    sleep and runtime pm ops.
> 2) Cases where the callbacks or struct dev_pm_ops is exported to
>    multiple modules.
> 3) Refactors that avoid duplication of callbacks or exports.
> 4) A tweak to the core input handling to use the new macros - this
>    is different from the driver changes, but seemed sensible.
> 
> Note there are a few cases in here where I a much more minimal
> set of callbacks is provided than DEFINE_SIMPLE_DEV_PM_OPS() and
> friends would set. I don't know the history behind those so whilst
> they might well be fine converted to the generic macros, I've
> left them alone.

Applied the lot, thank you.