lkml.org 
[lkml]   [2022]   [Aug]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 15/30] mfd: sm501: Remove #ifdef guards for PM related functions
    Date
    Use the new pm_sleep_ptr() macro to handle the .suspend/.resume
    callbacks.

    This macro allow the suspend and resume functions to be automatically
    dropped by the compiler when CONFIG_SUSPEND is disabled, without having
    to use #ifdef guards.

    This has the advantage of always compiling these functions in,
    independently of any Kconfig option. Thanks to that, bugs and other
    regressions are subsequently easier to catch.

    Signed-off-by: Paul Cercueil <paul@crapouillou.net>
    ---
    drivers/mfd/sm501.c | 10 ++--------
    1 file changed, 2 insertions(+), 8 deletions(-)

    diff --git a/drivers/mfd/sm501.c b/drivers/mfd/sm501.c
    index bc0a2c38653e..81e15e646e77 100644
    --- a/drivers/mfd/sm501.c
    +++ b/drivers/mfd/sm501.c
    @@ -1432,8 +1432,6 @@ static int sm501_plat_probe(struct platform_device *dev)

    }

    -#ifdef CONFIG_PM
    -
    /* power management support */

    static void sm501_set_power(struct sm501_devdata *sm, int on)
    @@ -1509,10 +1507,6 @@ static int sm501_plat_resume(struct platform_device *pdev)

    return 0;
    }
    -#else
    -#define sm501_plat_suspend NULL
    -#define sm501_plat_resume NULL
    -#endif

    /* Initialisation data for PCI devices */

    @@ -1714,8 +1708,8 @@ static struct platform_driver sm501_plat_driver = {
    },
    .probe = sm501_plat_probe,
    .remove = sm501_plat_remove,
    - .suspend = sm501_plat_suspend,
    - .resume = sm501_plat_resume,
    + .suspend = pm_sleep_ptr(sm501_plat_suspend),
    + .resume = pm_sleep_ptr(sm501_plat_resume),
    };

    static int __init sm501_base_init(void)
    --
    2.35.1
    \
     
     \ /
      Last update: 2022-08-08 19:45    [W:7.466 / U:0.024 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site