Merge remote-tracking branches 'asoc/topic/twl6040', 'asoc/topic/txx9', 'asoc/topic...
authorMark Brown <broonie@kernel.org>
Fri, 1 Sep 2017 11:13:15 +0000 (12:13 +0100)
committerMark Brown <broonie@kernel.org>
Fri, 1 Sep 2017 11:13:15 +0000 (12:13 +0100)
sound/soc/codecs/twl6040.c
sound/soc/codecs/wm8523.c
sound/soc/soc-utils.c
sound/soc/txx9/txx9aclc.c
sound/soc/ux500/mop500.c
sound/soc/ux500/ux500_msp_dai.c

index 0dc21f7e0af923fc7073f72890af4b6837713b1b..1773ff84ee3b23a659341efed47aa0d41770b78b 100644 (file)
@@ -1123,8 +1123,8 @@ static int twl6040_probe(struct snd_soc_codec *codec)
 
        priv->plug_irq = platform_get_irq(pdev, 0);
        if (priv->plug_irq < 0) {
-               dev_err(codec->dev, "invalid irq\n");
-               return -EINVAL;
+               dev_err(codec->dev, "invalid irq: %d\n", priv->plug_irq);
+               return priv->plug_irq;
        }
 
        INIT_DELAYED_WORK(&priv->hs_jack.work, twl6040_accessory_work);
index 6d0a2723bfde7e06956934d1792f719263353699..c7c33e98fbcb94424cda05b76a9ecc63753719f7 100644 (file)
@@ -100,7 +100,7 @@ static const struct snd_soc_dapm_route wm8523_dapm_routes[] = {
        { "LINEVOUTR", NULL, "DAC" },
 };
 
-static struct {
+static const struct {
        int value;
        int ratio;
 } lrclk_ratios[WM8523_NUM_RATES] = {
@@ -113,10 +113,10 @@ static struct {
        { 7, 1152 },
 };
 
-static struct {
+static const struct {
        int value;
        int ratio;
-} bclk_ratios[WM8523_NUM_RATES] = {
+} bclk_ratios[] = {
        { 2, 32 },
        { 3, 64 },
        { 4, 128 },
index 644d9a9ebfbc592f7fabf677bd8d721cee8b3196..e30aacbcfc291931dfb9723bcf35f0f66a220a4b 100644 (file)
@@ -284,7 +284,7 @@ static const struct snd_pcm_ops dummy_dma_ops = {
        .ioctl          = snd_pcm_lib_ioctl,
 };
 
-static struct snd_soc_platform_driver dummy_platform = {
+static const struct snd_soc_platform_driver dummy_platform = {
        .ops = &dummy_dma_ops,
 };
 
index 7912bf09dc4d70c66f19316c6c8f2b5a0d60357c..a2bb68fea5a32ae0ccb76f235d6c7ef4df399052 100644 (file)
@@ -271,7 +271,7 @@ static int txx9aclc_pcm_close(struct snd_pcm_substream *substream)
        return 0;
 }
 
-static struct snd_pcm_ops txx9aclc_pcm_ops = {
+static const struct snd_pcm_ops txx9aclc_pcm_ops = {
        .open           = txx9aclc_pcm_open,
        .close          = txx9aclc_pcm_close,
        .ioctl          = snd_pcm_lib_ioctl,
@@ -403,7 +403,7 @@ static int txx9aclc_pcm_remove(struct snd_soc_platform *platform)
        return 0;
 }
 
-static struct snd_soc_platform_driver txx9aclc_soc_platform = {
+static const struct snd_soc_platform_driver txx9aclc_soc_platform = {
        .probe          = txx9aclc_pcm_probe,
        .remove         = txx9aclc_pcm_remove,
        .ops            = &txx9aclc_pcm_ops,
index ba9fc099cf67b22997aad328f256c2b1150c86a1..070a6880980e89f5dc60d443b9fd5682715d7226 100644 (file)
@@ -115,7 +115,6 @@ static int mop500_probe(struct platform_device *pdev)
 
        dev_dbg(&pdev->dev, "%s: Card %s: Set platform drvdata.\n",
                __func__, mop500_card.name);
-       platform_set_drvdata(pdev, &mop500_card);
 
        snd_soc_card_set_drvdata(&mop500_card, NULL);
 
index ec5152aa3f6ed2a9b1eeeea37b967d1d689d2dad..625b72a5facda409bc3ad1f6822871a0cc05451b 100644 (file)
@@ -707,7 +707,7 @@ static int ux500_msp_dai_probe(struct snd_soc_dai *dai)
        return 0;
 }
 
-static struct snd_soc_dai_ops ux500_msp_dai_ops[] = {
+static const struct snd_soc_dai_ops ux500_msp_dai_ops[] = {
        {
                .set_sysclk = ux500_msp_dai_set_dai_sysclk,
                .set_fmt = ux500_msp_dai_set_dai_fmt,