diff options
| author | Lily Zhang <r58066@freescale.com> | 2011-04-13 14:28:46 +0800 |
|---|---|---|
| committer | Alex Gonzalez <alex.gonzalez@digi.com> | 2011-08-01 09:51:29 +0200 |
| commit | 59e1bffddb605ec3433864d7008d86658ec6f612 (patch) | |
| tree | ada4621cae1709965da7ebc08e21ed6a9ea003ce /sound | |
| parent | ae3c6d5b3b30873cedec28e24f93cbb39263bfbd (diff) | |
ENGR00141486-2 i.mx drivers: remove building warning message
remove building warning message in i.mx drivers
Signed-off-by: Lily Zhang <r58066@freescale.com>
Signed-off-by: Alex Gonzalez <alex.gonzalez@digi.com>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/cs42888.c | 12 | ||||
| -rw-r--r-- | sound/soc/imx/imx-3stack-sgtl5000.c | 8 |
2 files changed, 9 insertions, 11 deletions
diff --git a/sound/soc/codecs/cs42888.c b/sound/soc/codecs/cs42888.c index 93f6dba5d5da..19f1d6498bd8 100644 --- a/sound/soc/codecs/cs42888.c +++ b/sound/soc/codecs/cs42888.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 Freescale Semiconductor, Inc. All Rights Reserved. + * Copyright (C) 2010-2011 Freescale Semiconductor, Inc. All Rights Reserved. */ /* @@ -218,7 +218,7 @@ static int cs42888_fill_cache(struct snd_soc_codec *codec) * After the initial read to pre-fill the cache, the CS42888 never updates * the register values, so we won't have a cache coherency problem. */ -static u8 cs42888_read_reg_cache(struct snd_soc_codec *codec, +static unsigned int cs42888_read_reg_cache(struct snd_soc_codec *codec, unsigned int reg) { u8 *cache = codec->reg_cache; @@ -243,7 +243,7 @@ static u8 cs42888_read_reg_cache(struct snd_soc_codec *codec, * i2c_smbus_write_byte_data(), and it's just another layer of overhead. */ static int cs42888_i2c_write(struct snd_soc_codec *codec, unsigned int reg, - u8 value) + unsigned int value) { u8 *cache = codec->reg_cache; @@ -286,10 +286,6 @@ static void dump_reg(struct snd_soc_codec *codec) printk(KERN_DEBUG "dump end\n"); } -#else -static void dump_reg(struct snd_soc_codec *codec) -{ -} #endif /* -127.5dB to 0dB with step of 0.5dB */ @@ -720,7 +716,7 @@ static int cs42888_hw_params(struct snd_pcm_substream *substream, unsigned int i; unsigned int rate; unsigned int ratio; - u8 val; + unsigned int val; rate = params_rate(params); /* Sampling rate, in Hz */ ratio = cs42888->mclk / rate; /* MCLK/LRCK ratio */ diff --git a/sound/soc/imx/imx-3stack-sgtl5000.c b/sound/soc/imx/imx-3stack-sgtl5000.c index 3f13a2598262..d820d802ec11 100644 --- a/sound/soc/imx/imx-3stack-sgtl5000.c +++ b/sound/soc/imx/imx-3stack-sgtl5000.c @@ -309,8 +309,10 @@ static void headphone_detect_handler(struct work_struct *work) /* setup a message for userspace headphone in */ buf = kmalloc(32, GFP_ATOMIC); - if (!buf) - return -ENOMEM; + if (!buf) { + pr_err("%s kmalloc failed\n", __func__); + return; + } envp[0] = "NAME=headphone"; snprintf(buf, 32, "STATE=%d", hp_status); envp[1] = buf; @@ -587,7 +589,7 @@ static int __devinit imx_3stack_sgtl5000_probe(struct platform_device *pdev) { struct mxc_audio_platform_data *plat = pdev->dev.platform_data; struct imx_3stack_priv *priv = &card_priv; - struct snd_soc_dai *sgtl5000_cpu_dai; + struct snd_soc_dai *sgtl5000_cpu_dai = 0; struct sgtl5000_setup_data *setup; int ret = 0; |