From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
stable@vger.kernel.org, Lars-Peter Clausen <lars@metafoo.de>,
Mark Brown <broonie@opensource.wolfsonmicro.com>
Subject: [ 01/19] ASoC: dma-sh7760: Fix compile error
Date: Wed, 10 Apr 2013 15:50:24 -0700 [thread overview]
Message-ID: <20130410225026.982896657@linuxfoundation.org> (raw)
In-Reply-To: <20130410225026.833809117@linuxfoundation.org>
3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lars-Peter Clausen <lars@metafoo.de>
commit 417a1178f1bf3cdc606376b3ded3a22489fbb3eb upstream.
The dma-sh7760 currently fails with the following compile error:
sound/soc/sh/dma-sh7760.c:346:2: error: unknown field 'pcm_ops' specified in initializer
sound/soc/sh/dma-sh7760.c:346:2: warning: initialization from incompatible pointer type
sound/soc/sh/dma-sh7760.c:347:2: error: unknown field 'pcm_new' specified in initializer
sound/soc/sh/dma-sh7760.c:347:2: warning: initialization makes integer from pointer without a cast
sound/soc/sh/dma-sh7760.c:348:2: error: unknown field 'pcm_free' specified in initializer
sound/soc/sh/dma-sh7760.c:348:2: warning: initialization from incompatible pointer type
sound/soc/sh/dma-sh7760.c: In function 'sh7760_soc_platform_probe':
sound/soc/sh/dma-sh7760.c:353:2: warning: passing argument 2 of 'snd_soc_register_platform' from incompatible pointer type
include/sound/soc.h:368:5: note: expected 'struct snd_soc_platform_driver *' but argument is of type 'struct snd_soc_platform *'
This is due the misnaming of the snd_soc_platform_driver type name and 'ops'
field. The issue was introduced in commit f0fba2a("ASoC: multi-component - ASoC
Multi-Component Support").
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
sound/soc/sh/dma-sh7760.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- a/sound/soc/sh/dma-sh7760.c
+++ b/sound/soc/sh/dma-sh7760.c
@@ -342,8 +342,8 @@ static int camelot_pcm_new(struct snd_ca
return 0;
}
-static struct snd_soc_platform sh7760_soc_platform = {
- .pcm_ops = &camelot_pcm_ops,
+static struct snd_soc_platform_driver sh7760_soc_platform = {
+ .ops = &camelot_pcm_ops,
.pcm_new = camelot_pcm_new,
.pcm_free = camelot_pcm_free,
};
next prev parent reply other threads:[~2013-04-10 22:50 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-10 22:50 [ 00/19] 3.0.73-stable review Greg Kroah-Hartman
2013-04-10 22:50 ` Greg Kroah-Hartman [this message]
2013-04-10 22:50 ` [ 02/19] UBIFS: make space fixup work in the remount case Greg Kroah-Hartman
2013-04-10 22:50 ` [ 03/19] reiserfs: Fix warning and inode leak when deleting inode with xattrs Greg Kroah-Hartman
2013-04-11 7:33 ` Pawel Zawora
2013-04-11 19:04 ` Greg Kroah-Hartman
2013-04-10 22:50 ` [ 04/19] ALSA: hda - bug fix on return value when getting HDMI ELD info Greg Kroah-Hartman
2013-04-10 22:50 ` [ 05/19] ALSA: hda - fix typo in proc output Greg Kroah-Hartman
2013-04-10 22:50 ` [ 06/19] ext4: fixup 64-bit divides in 3.0-stable backport of upstream fix Greg Kroah-Hartman
2013-04-10 22:50 ` [ 07/19] libata: Use integer return value for atapi_command_packet_set Greg Kroah-Hartman
2013-04-10 22:50 ` [ 08/19] libata: Set max sector to 65535 for Slimtype DVD A DS8A8SH drive Greg Kroah-Hartman
2013-04-10 22:50 ` [ 09/19] alpha: Add irongate_io to PCI bus resources Greg Kroah-Hartman
2013-04-10 22:50 ` [ 10/19] ftrace: Consistently restore trace function on sysctl enabling Greg Kroah-Hartman
2013-04-10 22:50 ` [ 11/19] powerpc: pSeries_lpar_hpte_remove fails from Adjunct partition being performed before the ANDCOND test Greg Kroah-Hartman
2013-04-10 22:50 ` [ 12/19] spinlocks and preemption points need to be at least compiler barriers Greg Kroah-Hartman
2013-04-10 22:50 ` [ 13/19] crypto: gcm - fix assumption that assoc has one segment Greg Kroah-Hartman
2013-04-10 22:50 ` Greg Kroah-Hartman
2013-04-10 22:50 ` [ 14/19] block: avoid using uninitialized value in from queue_var_store Greg Kroah-Hartman
2013-04-10 22:50 ` [ 15/19] thermal: return an error on failure to register thermal class Greg Kroah-Hartman
2013-04-10 22:50 ` [ 16/19] mm: prevent mmap_cache race in find_vma() Greg Kroah-Hartman
2013-04-10 22:50 ` [ 17/19] x86-32, mm: Rip out x86_32 NUMA remapping code Greg Kroah-Hartman
2013-04-10 22:50 ` [ 18/19] Revert "mwifiex: cancel cmd timer and free curr_cmd in shutdown process Greg Kroah-Hartman
2013-04-10 22:50 ` [ 19/19] rt2x00: rt2x00pci_regbusy_read() - only print register access failure once Greg Kroah-Hartman
2013-04-10 22:50 ` Greg Kroah-Hartman
2013-04-11 16:29 ` [ 00/19] 3.0.73-stable review Shuah Khan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130410225026.982896657@linuxfoundation.org \
--to=gregkh@linuxfoundation.org \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=lars@metafoo.de \
--cc=linux-kernel@vger.kernel.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.