lkml.org 
[lkml]   [2019]   [Jun]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 179/241] ASoC: davinci-mcasp: Fix clang warning without CONFIG_PM
    Date
    [ Upstream commit 8ca5104715cfd14254ea5aecc390ae583b707607 ]

    Building with clang shows a variable that is only used by the
    suspend/resume functions but defined outside of their #ifdef block:

    sound/soc/ti/davinci-mcasp.c:48:12: error: variable 'context_regs' is not needed and will not be emitted

    We commonly fix these by marking the PM functions as __maybe_unused,
    but here that would grow the davinci_mcasp structure, so instead
    add another #ifdef here.

    Fixes: 1cc0c054f380 ("ASoC: davinci-mcasp: Convert the context save/restore to use array")
    Signed-off-by: Arnd Bergmann <arnd@arndb.de>
    Acked-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
    Reviewed-by: Nathan Chancellor <natechancellor@gmail.com>
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    sound/soc/davinci/davinci-mcasp.c | 2 ++
    1 file changed, 2 insertions(+)

    diff --git a/sound/soc/davinci/davinci-mcasp.c b/sound/soc/davinci/davinci-mcasp.c
    index 2ccb8bccc9d4c..512ec25c9ead1 100644
    --- a/sound/soc/davinci/davinci-mcasp.c
    +++ b/sound/soc/davinci/davinci-mcasp.c
    @@ -43,6 +43,7 @@

    #define MCASP_MAX_AFIFO_DEPTH 64

    +#ifdef CONFIG_PM
    static u32 context_regs[] = {
    DAVINCI_MCASP_TXFMCTL_REG,
    DAVINCI_MCASP_RXFMCTL_REG,
    @@ -65,6 +66,7 @@ struct davinci_mcasp_context {
    u32 *xrsr_regs; /* for serializer configuration */
    bool pm_state;
    };
    +#endif

    struct davinci_mcasp_ruledata {
    struct davinci_mcasp *mcasp;
    --
    2.20.1


    \
     
     \ /
      Last update: 2019-06-09 19:10    [W:6.310 / U:1.308 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site