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.9 121/145] drm: exynos: mark pm functions as __maybe_unused
    Date
    4.9-stable review patch.  If anyone has any objections, please let me know.

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

    From: Arnd Bergmann <arnd@arndb.de>

    commit 7e1751001818209b214b8c3df0b3c91fae250ea2 upstream.

    The rework of the exynos DRM clock handling introduced
    warnings for configurations that have CONFIG_PM disabled:

    drivers/gpu/drm/exynos/exynos_hdmi.c:736:13: error: 'hdmi_clk_disable_gates' defined but not used [-Werror=unused-function]
    static void hdmi_clk_disable_gates(struct hdmi_context *hdata)
    ^~~~~~~~~~~~~~~~~~~~~~
    drivers/gpu/drm/exynos/exynos_hdmi.c:717:12: error: 'hdmi_clk_enable_gates' defined but not used [-Werror=unused-function]
    static int hdmi_clk_enable_gates(struct hdmi_context *hdata)

    The problem is that the PM functions themselves are inside of
    an #ifdef, but some functions they call are not.

    This patch removes the #ifdef and instead marks the PM functions
    as __maybe_unused, which is a more reliable way to get it right.

    Link: https://patchwork.kernel.org/patch/8436281/
    Fixes: 9be7e9898444 ("drm/exynos/hdmi: clock code re-factoring")
    Signed-off-by: Arnd Bergmann <arnd@arndb.de>
    Signed-off-by: Inki Dae <inki.dae@samsung.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/gpu/drm/exynos/exynos_hdmi.c | 6 ++----
    1 file changed, 2 insertions(+), 4 deletions(-)

    --- a/drivers/gpu/drm/exynos/exynos_hdmi.c
    +++ b/drivers/gpu/drm/exynos/exynos_hdmi.c
    @@ -1939,8 +1939,7 @@ static int hdmi_remove(struct platform_d
    return 0;
    }

    -#ifdef CONFIG_PM
    -static int exynos_hdmi_suspend(struct device *dev)
    +static int __maybe_unused exynos_hdmi_suspend(struct device *dev)
    {
    struct hdmi_context *hdata = dev_get_drvdata(dev);

    @@ -1949,7 +1948,7 @@ static int exynos_hdmi_suspend(struct de
    return 0;
    }

    -static int exynos_hdmi_resume(struct device *dev)
    +static int __maybe_unused exynos_hdmi_resume(struct device *dev)
    {
    struct hdmi_context *hdata = dev_get_drvdata(dev);
    int ret;
    @@ -1960,7 +1959,6 @@ static int exynos_hdmi_resume(struct dev

    return 0;
    }
    -#endif

    static const struct dev_pm_ops exynos_hdmi_pm_ops = {
    SET_RUNTIME_PM_OPS(exynos_hdmi_suspend, exynos_hdmi_resume, NULL)

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