[alsa-devel] [PATCH] cs4236: cs4232 and cs4236 driver merge to solve PnP BIOS detection (2nd rev)

[Takashi Iwai]

At Mon, 16 Feb 2009 19:16:33 -0500,
Stanley Pinchak wrote:
> 
> Krzysztof and Takashi,
>      I would like to stress test the new driver modifications.  I have
> run into some troubles with a program called cmus when outputting to
> alsa via libao.  The problems occurred during seeking, leaving the
> driver in a broken state.  The bug seemed to disappear when I used
> native alsa output.  I don't want to be chasing down application bugs
> on your time, so I was hoping you could suggest a way to test the
> driver while introducing the least vectors for non alsa code base
> bugs.  Thanks in advance.

Thanks.  Let me know if you find out a problem.

OTOH, the fact that the native ALSA output works implies that it's
rather an application-side problem...

BTW, I removed snd-cs4236-lib module now since it's a module solely
used by snd-cs4236.  Now it's merged into snd-cs4236 by the patch
below.


Takashi

===
From cda9043d56cee9fea39e4ee33fd605ae477a1950 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai at suse.de>
Date: Tue, 17 Feb 2009 08:10:54 +0100
Subject: [PATCH] ALSA: cs4236 - Merge snd-cs4236-lib module into snd-cs4236

Since cs4232 and cs4236 drivers are merged, there is no reason to keep
snd-cs4236-lib module separately.  Let's merge it into the main driver
as well.

Signed-off-by: Takashi Iwai <tiwai at suse.de>
---
 sound/isa/cs423x/Makefile     |    6 +++---
 sound/isa/cs423x/cs4236_lib.c |   24 ------------------------
 2 files changed, 3 insertions(+), 27 deletions(-)

diff --git a/sound/isa/cs423x/Makefile b/sound/isa/cs423x/Makefile
index 732f66c..6d397e8 100644
--- a/sound/isa/cs423x/Makefile
+++ b/sound/isa/cs423x/Makefile
@@ -3,11 +3,11 @@
 # Copyright (c) 2001 by Jaroslav Kysela <perex at perex.cz>
 #
 
-snd-cs4236-lib-objs := cs4236_lib.o
 snd-cs4231-objs := cs4231.o
-snd-cs4236-objs := cs4236.o
+snd-cs4236-objs := cs4236.o cs4236_lib.o
 
 # Toplevel Module Dependency
 obj-$(CONFIG_SND_CS4231) += snd-cs4231.o
-obj-$(CONFIG_SND_CS4236) += snd-cs4236.o snd-cs4236-lib.o
+obj-$(CONFIG_SND_CS4236) += snd-cs4236.o
+
 
diff --git a/sound/isa/cs423x/cs4236_lib.c b/sound/isa/cs423x/cs4236_lib.c
index 2406efd..38835f3 100644
--- a/sound/isa/cs423x/cs4236_lib.c
+++ b/sound/isa/cs423x/cs4236_lib.c
@@ -88,10 +88,6 @@
 #include <sound/wss.h>
 #include <sound/asoundef.h>
 
-MODULE_AUTHOR("Jaroslav Kysela <perex at perex.cz>");
-MODULE_DESCRIPTION("Routines for control of CS4235/4236B/4237B/4238B/4239 chips");
-MODULE_LICENSE("GPL");
-
 /*
  *
  */
@@ -1022,23 +1018,3 @@ int snd_cs4236_mixer(struct snd_wss *chip)
 	}
 	return 0;
 }
-
-EXPORT_SYMBOL(snd_cs4236_create);
-EXPORT_SYMBOL(snd_cs4236_pcm);
-EXPORT_SYMBOL(snd_cs4236_mixer);
-
-/*
- *  INIT part
- */
-
-static int __init alsa_cs4236_init(void)
-{
-	return 0;
-}
-
-static void __exit alsa_cs4236_exit(void)
-{
-}
-
-module_init(alsa_cs4236_init)
-module_exit(alsa_cs4236_exit)
-- 
1.6.1.3