From: Dirk Behme <dirk.behme@de.bosch.com>
To: linux-omap-open-source@linux.omap.com
Subject: [PATCH] Make ALSA omap-aic23.c compile again
Date: Tue, 17 Jan 2006 19:45:37 +0100 [thread overview]
Message-ID: <43CD3B51.80105@de.bosch.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 538 bytes --]
ARM: OMAP: Remove errors and warnings and make omap-aic23.c compile again:
sound/arm/omap-aic23.c:661: error: structure has no member named
`pm_private_data'
sound/arm/omap-aic23.c:680: error: structure has no member named
`pm_private_data'
sound/arm/omap-aic23.c:772: warning: implicit declaration of function
`clk_get_usecount'
sound/arm/omap-aic23.c:863: warning: implicit declaration of function
`snd_card_set_pm_callback'
Note: Needs "Fix clk_get_usecount() warning" patch
Signed-off-by: Dirk Behme <dirk.behme_at_de.bosch.com>
[-- Attachment #2: omap-aic23.patch --]
[-- Type: text/plain, Size: 1491 bytes --]
--- ./sound/arm/omap-aic23.c_orig 2006-01-17 19:26:00.707889264 +0100
+++ ./sound/arm/omap-aic23.c 2006-01-17 19:38:02.260196640 +0100
@@ -59,6 +59,7 @@
#include <asm/arch/dma.h>
#include <asm/arch/aic23.h>
#include <asm/arch/mcbsp.h>
+#include <asm/arch/clock.h>
#include <sound/core.h>
#include <sound/pcm.h>
@@ -658,7 +659,7 @@ static int __init snd_card_omap_aic23_pc
static int snd_omap_aic23_suspend(snd_card_t * card, pm_message_t state)
{
- struct snd_card_omap_aic23 *chip = card->pm_private_data;
+ struct snd_card_omap_aic23 *chip = card->private_data;
ADEBUG();
if (chip->card->power_state != SNDRV_CTL_POWER_D3hot) {
@@ -677,7 +678,7 @@ static int snd_omap_aic23_suspend(snd_ca
*/
static int snd_omap_aic23_resume(snd_card_t * card)
{
- struct snd_card_omap_aic23 *chip = card->pm_private_data;
+ struct snd_card_omap_aic23 *chip = card->private_data;
ADEBUG();
if (chip->card->power_state != SNDRV_CTL_POWER_D0) {
@@ -860,14 +861,13 @@ static int __init snd_omap_aic23_probe(s
if ((err = snd_card_omap_aic23_pcm(omap_aic23, 0)) < 0)
goto nodev;
- snd_card_set_pm_callback(card, snd_omap_aic23_suspend,
- snd_omap_aic23_resume, omap_aic23);
-
strcpy(card->driver, "AIC23");
strcpy(card->shortname, "OSK AIC23");
sprintf(card->longname, "OMAP OSK with AIC23");
snd_omap_init_mixer();
+
+ snd_card_set_dev(card, &pdev->dev);
if ((err = snd_card_register(card)) == 0) {
printk(KERN_INFO "OSK audio support initialized\n");
[-- Attachment #3: Type: text/plain, Size: 0 bytes --]
next reply other threads:[~2006-01-17 18:45 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-01-17 18:45 Dirk Behme [this message]
2006-01-20 19:04 ` [PATCH] Make ALSA omap-aic23.c compile again Tony Lindgren
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=43CD3B51.80105@de.bosch.com \
--to=dirk.behme@de.bosch.com \
--cc=linux-omap-open-source@linux.omap.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox