From mboxrd@z Thu Jan 1 00:00:00 1970 From: Takashi Iwai Subject: Re: Re: AC97 related build problem with CVS Date: Mon, 29 Nov 2004 12:38:36 +0100 Message-ID: References: <1100933119.6879.9.camel@krustophenia.net> <87is7pcejx.fsf@sycorax.lbl.gov> Mime-Version: 1.0 (generated by SEMI 1.14.5 - "Awara-Onsen") Content-Type: multipart/mixed; boundary="Multipart_Mon_Nov_29_12:38:36_2004-1" Return-path: In-Reply-To: <87is7pcejx.fsf@sycorax.lbl.gov> Sender: alsa-devel-admin@lists.sourceforge.net Errors-To: alsa-devel-admin@lists.sourceforge.net List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , List-Archive: To: Alex Romosan Cc: Lee Revell , alsa-devel List-Id: alsa-devel@alsa-project.org --Multipart_Mon_Nov_29_12:38:36_2004-1 Content-Type: text/plain; charset=US-ASCII At Sun, 28 Nov 2004 23:14:26 -0800, Alex Romosan wrote: > > Takashi Iwai writes: > > > At Sat, 20 Nov 2004 01:45:19 -0500, > > Lee Revell wrote: > >> > >> This must be related to the AC97 changes committed recently. CVS from > >> yesterday works, but today I get: > >> > >> make[1]: Entering directory > >> `/home/rlrevell/kernel-source/linux-2.6.9-rc3-mm3-T3' > >> Building modules, stage 2. > >> MODPOST > >> *** Warning: > >> "snd_ac97_restore_iec958" [/home/rlrevell/cvs/alsa/alsa-driver/pci/ac97/snd-ac97-codec.ko] undefined! > >> *** Warning: > >> "snd_ac97_restore_status" [/home/rlrevell/cvs/alsa/alsa-driver/pci/ac97/snd-ac97-codec.ko] undefined! > > > > Fine on my system. I don't think I missed the cvs commit.... > > Could you verify again? Did you get the compile warning during > > compilation of ac97_codec.c and ac97_patch.c? > > snd_ac97_restore_iec958 and snd_ac97_restore_status are defined only > if the kernel is configured with CONFIG_PM defined. there are some > missing #ifdef CONFIG_PM in ac97_patch.c. Ah ok, now fixed on CVS. The patch is attached below. Takashi --Multipart_Mon_Nov_29_12:38:36_2004-1 Content-Type: text/plain; charset=US-ASCII Index: alsa-kernel/include/ac97_codec.h =================================================================== RCS file: /suse/tiwai/cvs/alsa/alsa-kernel/include/ac97_codec.h,v retrieving revision 1.55 retrieving revision 1.56 diff -u -r1.55 -r1.56 --- alsa-kernel/include/ac97_codec.h 19 Nov 2004 13:44:27 -0000 1.55 +++ alsa-kernel/include/ac97_codec.h 29 Nov 2004 11:34:49 -0000 1.56 @@ -423,7 +423,9 @@ int (*build_specific) (ac97_t *ac97); int (*build_spdif) (ac97_t *ac97); int (*build_post_spdif) (ac97_t *ac97); +#ifdef CONFIG_PM void (*resume) (ac97_t *ac97); +#endif }; struct _snd_ac97_bus_ops { Index: alsa-kernel/pci/ac97/ac97_patch.c =================================================================== RCS file: /suse/tiwai/cvs/alsa/alsa-kernel/pci/ac97/ac97_patch.c,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- alsa-kernel/pci/ac97/ac97_patch.c 25 Nov 2004 15:23:16 -0000 1.60 +++ alsa-kernel/pci/ac97/ac97_patch.c 29 Nov 2004 11:34:49 -0000 1.61 @@ -775,6 +775,7 @@ /* * Analog Device AD18xx, AD19xx codecs */ +#ifdef CONFIG_PM static void ad18xx_resume(ac97_t *ac97) { static unsigned short setup_regs[] = { @@ -837,6 +838,7 @@ snd_ac97_restore_iec958(ac97); } +#endif int patch_ad1819(ac97_t * ac97) { @@ -907,7 +909,9 @@ } static struct snd_ac97_build_ops patch_ad1881_build_ops = { +#ifdef CONFIG_PM .resume = &ad18xx_resume +#endif }; int patch_ad1881(ac97_t * ac97) @@ -988,7 +992,9 @@ static struct snd_ac97_build_ops patch_ad1885_build_ops = { .build_specific = &patch_ad1885_specific, +#ifdef CONFIG_PM .resume = &ad18xx_resume +#endif }; int patch_ad1885(ac97_t * ac97) @@ -1096,7 +1102,9 @@ static struct snd_ac97_build_ops patch_ad1981a_build_ops = { .build_post_spdif = patch_ad198x_post_spdif, .build_specific = patch_ad1981a_specific, +#ifdef CONFIG_PM .resume = ad18xx_resume +#endif }; int patch_ad1981a(ac97_t *ac97) @@ -1125,7 +1133,9 @@ static struct snd_ac97_build_ops patch_ad1981b_build_ops = { .build_post_spdif = patch_ad198x_post_spdif, .build_specific = patch_ad1981b_specific, +#ifdef CONFIG_PM .resume = ad18xx_resume +#endif }; int patch_ad1981b(ac97_t *ac97) @@ -1241,7 +1251,9 @@ static struct snd_ac97_build_ops patch_ad1888_build_ops = { .build_post_spdif = patch_ad198x_post_spdif, .build_specific = patch_ad1888_specific, +#ifdef CONFIG_PM .resume = ad18xx_resume +#endif }; int patch_ad1888(ac97_t * ac97) @@ -1276,7 +1288,9 @@ static struct snd_ac97_build_ops patch_ad1980_build_ops = { .build_post_spdif = patch_ad198x_post_spdif, .build_specific = patch_ad1980_specific, +#ifdef CONFIG_PM .resume = ad18xx_resume +#endif }; int patch_ad1980(ac97_t * ac97) @@ -1303,7 +1317,9 @@ static struct snd_ac97_build_ops patch_ad1985_build_ops = { .build_post_spdif = patch_ad198x_post_spdif, .build_specific = patch_ad1985_specific, +#ifdef CONFIG_PM .resume = ad18xx_resume +#endif }; int patch_ad1985(ac97_t * ac97) --Multipart_Mon_Nov_29_12:38:36_2004-1-- ------------------------------------------------------- SF email is sponsored by - The IT Product Guide Read honest & candid reviews on hundreds of IT Products from real users. Discover which products truly live up to the hype. Start reading now. http://productguide.itmanagersjournal.com/