kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branches 'asoc/topic/twl6040', 'asoc/topic/txx9', 'asoc/topic/utils', 'asoc/topic/ux500' and 'asoc/topic/wm8523' into asoc-next

Browse source
This commit is contained in:
Mark Brown 2017-09-01 12:13:15 +01:00
commit 6f78e0a1b2
6 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sound/soc/codecs/twl6040.c
View 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);

6
sound/soc/codecs/wm8523.c
View 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 },

2
sound/soc/soc-utils.c
View 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,
};

4
sound/soc/txx9/txx9aclc.c
View 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,

1
sound/soc/ux500/mop500.c
View 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);

2
sound/soc/ux500/ux500_msp_dai.c
View 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,