lkml.org 
[lkml]   [2016]   [May]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.5 111/200] ASoC: s3c24xx: use const snd_soc_component_driver pointer
    Date
    4.5-stable review patch.  If anyone has any objections, please let me know.

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

    From: Arnd Bergmann <arnd@arndb.de>

    commit ba4bc32eaa39ba7687f0958ae90eec94da613b46 upstream.

    An older patch to convert the API in the s3c i2s driver
    ended up passing a const pointer into a function that takes
    a non-const pointer, so we now get a warning:

    sound/soc/samsung/s3c2412-i2s.c: In function 's3c2412_iis_dev_probe':
    sound/soc/samsung/s3c2412-i2s.c:172:9: error: passing argument 3 of 's3c_i2sv2_register_component' discards 'const' qualifier from pointer target type [-Werror=discarded-qualifiers]

    However, the s3c_i2sv2_register_component() function again
    passes the pointer into another function taking a const, so
    we just need to change its prototype.

    Fixes: eca3b01d0885 ("ASoC: switch over to use snd_soc_register_component() on s3c i2s")
    Signed-off-by: Arnd Bergmann <arnd@arndb.de>
    Reviewed-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    sound/soc/samsung/s3c-i2s-v2.c | 2 +-
    sound/soc/samsung/s3c-i2s-v2.h | 2 +-
    2 files changed, 2 insertions(+), 2 deletions(-)

    --- a/sound/soc/samsung/s3c-i2s-v2.c
    +++ b/sound/soc/samsung/s3c-i2s-v2.c
    @@ -709,7 +709,7 @@ static int s3c2412_i2s_resume(struct snd
    #endif

    int s3c_i2sv2_register_component(struct device *dev, int id,
    - struct snd_soc_component_driver *cmp_drv,
    + const struct snd_soc_component_driver *cmp_drv,
    struct snd_soc_dai_driver *dai_drv)
    {
    struct snd_soc_dai_ops *ops = (struct snd_soc_dai_ops *)dai_drv->ops;
    --- a/sound/soc/samsung/s3c-i2s-v2.h
    +++ b/sound/soc/samsung/s3c-i2s-v2.h
    @@ -101,7 +101,7 @@ extern int s3c_i2sv2_probe(struct snd_so
    * soc core.
    */
    extern int s3c_i2sv2_register_component(struct device *dev, int id,
    - struct snd_soc_component_driver *cmp_drv,
    + const struct snd_soc_component_driver *cmp_drv,
    struct snd_soc_dai_driver *dai_drv);

    #endif /* __SND_SOC_S3C24XX_S3C_I2SV2_I2S_H */

    \
     
     \ /
      Last update: 2016-05-03 03:21    [W:5.305 / U:0.096 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site