lkml.org 
[lkml]   [2022]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 156/846] mfd: atmel-flexcom: Remove #ifdef CONFIG_PM_SLEEP
    Date
    From: Claudiu Beznea <claudiu.beznea@microchip.com>

    [ Upstream commit 8c0fad75dcaa650e3f3145a2c35847bc6a65cb7f ]

    Remove compilation flag and use __maybe_unused and pm_ptr instead.

    Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com>
    Acked-by: Nicolas Ferre <nicolas.ferre@microchip.com>
    Signed-off-by: Lee Jones <lee.jones@linaro.org>
    Link: https://lore.kernel.org/r/20211028135138.3481166-2-claudiu.beznea@microchip.com
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/mfd/atmel-flexcom.c | 6 ++----
    1 file changed, 2 insertions(+), 4 deletions(-)

    diff --git a/drivers/mfd/atmel-flexcom.c b/drivers/mfd/atmel-flexcom.c
    index d2f5c073fdf31..962f66dc8813e 100644
    --- a/drivers/mfd/atmel-flexcom.c
    +++ b/drivers/mfd/atmel-flexcom.c
    @@ -87,8 +87,7 @@ static const struct of_device_id atmel_flexcom_of_match[] = {
    };
    MODULE_DEVICE_TABLE(of, atmel_flexcom_of_match);

    -#ifdef CONFIG_PM_SLEEP
    -static int atmel_flexcom_resume(struct device *dev)
    +static int __maybe_unused atmel_flexcom_resume(struct device *dev)
    {
    struct atmel_flexcom *ddata = dev_get_drvdata(dev);
    int err;
    @@ -105,7 +104,6 @@ static int atmel_flexcom_resume(struct device *dev)

    return 0;
    }
    -#endif

    static SIMPLE_DEV_PM_OPS(atmel_flexcom_pm_ops, NULL,
    atmel_flexcom_resume);
    @@ -114,7 +112,7 @@ static struct platform_driver atmel_flexcom_driver = {
    .probe = atmel_flexcom_probe,
    .driver = {
    .name = "atmel_flexcom",
    - .pm = &atmel_flexcom_pm_ops,
    + .pm = pm_ptr(&atmel_flexcom_pm_ops),
    .of_match_table = atmel_flexcom_of_match,
    },
    };
    --
    2.34.1


    \
     
     \ /
      Last update: 2022-01-24 23:11    [W:6.497 / U:0.096 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site