lkml.org 
[lkml]   [2018]   [Feb]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 112/193] hwrng: exynos - use __maybe_unused to hide pm functions
    Date
    4.4-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Arnd Bergmann <arnd@arndb.de>

    commit b93f342da1766ef1740e6277508329356c4ea48b upstream.

    The exynos random driver uses #ifdef to check for CONFIG_PM, but
    then uses SIMPLE_DEV_PM_OPS, which leaves the references out when
    CONFIG_PM_SLEEP is not defined, so we get a warning with
    PM=y && PM_SLEEP=n:

    drivers/char/hw_random/exynos-rng.c:166:12: error: 'exynos_rng_suspend' defined but not used [-Werror=unused-function]
    drivers/char/hw_random/exynos-rng.c:171:12: error: 'exynos_rng_resume' defined but not used [-Werror=unused-function]

    This removes the incorrect #ifdef and instead uses a __maybe_unused
    annotation to let the compiler know it can silently drop
    the function definition.

    Signed-off-by: Arnd Bergmann <arnd@arndb.de>
    Reviewed-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
    Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/char/hw_random/exynos-rng.c | 10 ++++------
    1 file changed, 4 insertions(+), 6 deletions(-)

    --- a/drivers/char/hw_random/exynos-rng.c
    +++ b/drivers/char/hw_random/exynos-rng.c
    @@ -155,8 +155,7 @@ static int exynos_rng_probe(struct platf
    return ret;
    }

    -#ifdef CONFIG_PM
    -static int exynos_rng_runtime_suspend(struct device *dev)
    +static int __maybe_unused exynos_rng_runtime_suspend(struct device *dev)
    {
    struct platform_device *pdev = to_platform_device(dev);
    struct exynos_rng *exynos_rng = platform_get_drvdata(pdev);
    @@ -166,7 +165,7 @@ static int exynos_rng_runtime_suspend(st
    return 0;
    }

    -static int exynos_rng_runtime_resume(struct device *dev)
    +static int __maybe_unused exynos_rng_runtime_resume(struct device *dev)
    {
    struct platform_device *pdev = to_platform_device(dev);
    struct exynos_rng *exynos_rng = platform_get_drvdata(pdev);
    @@ -174,12 +173,12 @@ static int exynos_rng_runtime_resume(str
    return clk_prepare_enable(exynos_rng->clk);
    }

    -static int exynos_rng_suspend(struct device *dev)
    +static int __maybe_unused exynos_rng_suspend(struct device *dev)
    {
    return pm_runtime_force_suspend(dev);
    }

    -static int exynos_rng_resume(struct device *dev)
    +static int __maybe_unused exynos_rng_resume(struct device *dev)
    {
    struct platform_device *pdev = to_platform_device(dev);
    struct exynos_rng *exynos_rng = platform_get_drvdata(pdev);
    @@ -191,7 +190,6 @@ static int exynos_rng_resume(struct devi

    return exynos_rng_configure(exynos_rng);
    }
    -#endif

    static const struct dev_pm_ops exynos_rng_pm_ops = {
    SET_SYSTEM_SLEEP_PM_OPS(exynos_rng_suspend, exynos_rng_resume)

    \
     
     \ /
      Last update: 2018-02-23 21:25    [W:4.118 / U:0.136 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site