On Tue, Jun 21, 2022 at 1:21 PM Jonathan Cameron <jic23@xxxxxxxxxx> wrote:
>
> From: Jonathan Cameron <Jonathan.Cameron@xxxxxxxxxx>
>
> Using these newer macros allows the compiler to remove the unused
> structure and functions when !CONFIG_PM_SLEEP + removes the need to
> mark pm functions __maybe_unused.
>
> Signed-off-by: Jonathan Cameron <Jonathan.Cameron@xxxxxxxxxx>
> Cc: Enric Balletbo i Serra <enric.balletbo@xxxxxxxxxxxxx>
> Cc: Gwendal Grignou <gwendal@xxxxxxxxxxxx>
> Cc: Stephen Boyd <swboyd@xxxxxxxxxxxx>
Reviewed-by: Gwendal Grignou <gwendal@xxxxxxxxxxxx>
> ---
> drivers/iio/proximity/cros_ec_mkbp_proximity.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/iio/proximity/cros_ec_mkbp_proximity.c b/drivers/iio/proximity/cros_ec_mkbp_proximity.c
> index 8213b0081713..571ea1812246 100644
> --- a/drivers/iio/proximity/cros_ec_mkbp_proximity.c
> +++ b/drivers/iio/proximity/cros_ec_mkbp_proximity.c
> @@ -184,7 +184,7 @@ static const struct iio_info cros_ec_mkbp_proximity_info = {
> .write_event_config = cros_ec_mkbp_proximity_write_event_config,
> };
>
> -static __maybe_unused int cros_ec_mkbp_proximity_resume(struct device *dev)
> +static int cros_ec_mkbp_proximity_resume(struct device *dev)
> {
> struct cros_ec_mkbp_proximity_data *data = dev_get_drvdata(dev);
> struct cros_ec_device *ec = data->ec;
> @@ -201,8 +201,8 @@ static __maybe_unused int cros_ec_mkbp_proximity_resume(struct device *dev)
> return 0;
> }
>
> -static SIMPLE_DEV_PM_OPS(cros_ec_mkbp_proximity_pm_ops, NULL,
> - cros_ec_mkbp_proximity_resume);
> +static DEFINE_SIMPLE_DEV_PM_OPS(cros_ec_mkbp_proximity_pm_ops, NULL,
> + cros_ec_mkbp_proximity_resume);
>
> static int cros_ec_mkbp_proximity_probe(struct platform_device *pdev)
> {
> @@ -260,7 +260,7 @@ static struct platform_driver cros_ec_mkbp_proximity_driver = {
> .driver = {
> .name = "cros-ec-mkbp-proximity",
> .of_match_table = cros_ec_mkbp_proximity_of_match,
> - .pm = &cros_ec_mkbp_proximity_pm_ops,
> + .pm = pm_sleep_ptr(&cros_ec_mkbp_proximity_pm_ops),
> },
> .probe = cros_ec_mkbp_proximity_probe,
> .remove = cros_ec_mkbp_proximity_remove,
> --
> 2.36.1
>
