Merge master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa

8f0cb147 · Linus Torvalds <[email protected]> · 2005-11-07 08:09:02 -08:00

Commit: 8f0cb147b2fb12427bf6abef7fed2b604557a41e
Parents: 8e33ba49 · b00e8443

Merge commit. Changes below are compared with the first parent: 8e33ba49.

Changes

165 files changed · +3682 −3019

File	Status	Add	Del	Content
Documentation/sound/alsa/ALSA-Configuration.txt	modified	+20	−9	View file
Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl	modified	+15	−41	View file
drivers/char/rtc.c	modified	+38	−27	View file
include/sound/ac97_codec.h	modified	+0	−10	View file
include/sound/core.h	modified	+14	−80	View file
include/sound/driver.h	modified	+0	−17	View file
include/sound/emu10k1.h	modified	+2	−1	View file
include/sound/minors.h	modified	+3	−5	View file
include/sound/pcm.h	modified	+1	−2	View file
include/sound/timer.h	modified	+1	−0	View file
include/sound/version.h	modified	+2	−2	View file
sound/Kconfig	modified	+8	−0	View file
sound/core/Kconfig	modified	+0	−6	View file
sound/core/Makefile	modified	+1	−2	View file
sound/core/control.c	modified	+9	−9	View file
sound/core/hwdep.c	modified	+3	−7	View file
sound/core/info.c	modified	+0	−2	View file
sound/core/init.c	modified	+4	−3	View file
sound/core/memory.c	modified	+2	−214	View file
sound/core/misc.c	modified	+6	−8	View file
sound/core/oss/mixer_oss.c	modified	+43	−19	View file
sound/core/oss/pcm_oss.c	modified	+17	−3	View file
sound/core/pcm.c	modified	+2	−1	View file
sound/core/pcm_lib.c	modified	+2	−3	View file
sound/core/pcm_native.c	modified	+6	−12	View file
sound/core/rawmidi.c	modified	+4	−8	View file
sound/core/rtctimer.c	modified	+7	−17	View file
sound/core/seq/seq_instr.c	modified	+4	−8	View file
sound/core/seq/seq_lock.c	modified	+1	−2	View file
sound/core/seq/seq_memory.c	modified	+1	−2	View file
sound/core/seq/seq_midi.c	modified	+0	−2	View file
sound/core/seq/seq_timer.c	modified	+21	−8	View file
sound/core/sound.c	modified	+3	−21	View file
sound/core/timer.c	modified	+222	−158	View file
sound/core/wrappers.c	deleted	+0	−50	View before deletion
sound/drivers/mpu401/mpu401_uart.c	modified	+1	−4	View file
sound/drivers/mtpav.c	modified	+1	−4	View file
sound/drivers/opl3/opl3_lib.c	modified	+2	−8	View file
sound/drivers/opl4/opl4_lib.c	modified	+2	−8	View file
sound/drivers/serial-u16550.c	modified	+1	−4	View file
sound/drivers/vx/vx_pcm.c	modified	+2	−2	View file
sound/i2c/cs8427.c	modified	+8	−9	View file
sound/i2c/other/ak4114.c	modified	+3	−3	View file
sound/i2c/other/ak4117.c	modified	+4	−4	View file
sound/i2c/tea6330t.c	modified	+1	−1	View file
sound/isa/ad1816a/ad1816a_lib.c	modified	+1	−4	View file
sound/isa/ad1848/ad1848_lib.c	modified	+11	−16	View file
sound/isa/cs423x/cs4231_lib.c	modified	+2	−8	View file
sound/isa/cs423x/cs4236.c	modified	+2	−6	View file
sound/isa/cs423x/cs4236_lib.c	modified	+4	−1	View file
sound/isa/es1688/es1688_lib.c	modified	+1	−2	View file
sound/isa/es18xx.c	modified	+22	−27	View file
sound/isa/gus/gus_dma.c	modified	+1	−1	View file
sound/isa/gus/gus_io.c	modified	+47	−47	View file
sound/isa/gus/gus_main.c	modified	+8	−17	View file
sound/isa/gus/gus_mem.c	modified	+1	−1	View file
sound/isa/gus/gus_pcm.c	modified	+2	−3	View file
sound/isa/gus/gus_reset.c	modified	+2	−2	View file
sound/isa/gus/gus_simple.c	modified	+1	−1	View file
sound/isa/gus/gus_uart.c	modified	+2	−2	View file
sound/isa/gus/gus_volume.c	modified	+3	−3	View file
sound/isa/gus/interwave.c	modified	+3	−6	View file
sound/isa/opl3sa2.c	modified	+1	−4	View file
sound/isa/opti9xx/opti92x-ad1848.c	modified	+7	−18	View file
sound/isa/sb/emu8000.c	modified	+6	−18	View file
sound/isa/sb/emu8000_patch.c	modified	+1	−2	View file
sound/isa/sb/emu8000_pcm.c	modified	+1	−2	View file
sound/isa/sb/emu8000_synth.c	modified	+1	−1	View file
sound/isa/sb/sb16.c	modified	+1	−4	View file
sound/isa/sb/sb16_main.c	modified	+4	−4	View file
sound/isa/sb/sb8.c	modified	+1	−4	View file
sound/isa/sb/sb8_main.c	modified	+0	−3	View file
sound/isa/sb/sb_common.c	modified	+5	−7	View file
sound/isa/sb/sb_mixer.c	modified	+2	−2	View file
sound/isa/sscape.c	modified	+4	−19	View file
sound/isa/wavefront/wavefront.c	modified	+1	−4	View file
sound/isa/wavefront/wavefront_synth.c	modified	+2	−4	View file
sound/mips/au1x00.c	modified	+5	−8	View file
sound/pci/Kconfig	modified	+1	−8	View file
sound/pci/ac97/ac97_codec.c	modified	+9	−47	View file
sound/pci/ac97/ac97_patch.c	modified	+52	−28	View file
sound/pci/ac97/ac97_pcm.c	modified	+9	−0	View file
sound/pci/ad1889.c	modified	+2	−3	View file
sound/pci/ali5451/ali5451.c	modified	+41	−51	View file
sound/pci/als4000.c	modified	+3	−5	View file
sound/pci/atiixp.c	modified	+20	−30	View file
sound/pci/atiixp_modem.c	modified	+14	−23	View file
sound/pci/au88x0/au8810.h	modified	+0	−5	View file
sound/pci/au88x0/au8820.h	modified	+0	−5	View file
sound/pci/au88x0/au8830.h	modified	+0	−5	View file
sound/pci/au88x0/au88x0.c	modified	+1	−1	View file
sound/pci/au88x0/au88x0.h	modified	+8	−0	View file
sound/pci/au88x0/au88x0_a3d.c	modified	+1	−1	View file
sound/pci/au88x0/au88x0_core.c	modified	+6	−4	View file
sound/pci/au88x0/au88x0_eq.c	modified	+1	−1	View file
sound/pci/au88x0/au88x0_synth.c	modified	+4	−4	View file
sound/pci/azt3328.c	modified	+667	−338	View file
sound/pci/azt3328.h	modified	+72	−63	View file
sound/pci/ca0106/Makefile	modified	+1	−1	View file
sound/pci/ca0106/ca0106.h	modified	+23	−4	View file
sound/pci/ca0106/ca0106_main.c	modified	+116	−7	View file
sound/pci/ca0106/ca_midi.c	added	+306	−0	View file
sound/pci/ca0106/ca_midi.h	added	+69	−0	View file
sound/pci/cmipci.c	modified	+71	−55	View file
sound/pci/cs4281.c	modified	+2	−4	View file
sound/pci/cs46xx/cs46xx_lib.c	modified	+20	−23	View file
sound/pci/emu10k1/emu10k1.c	modified	+1	−1	View file
sound/pci/emu10k1/emu10k1_callback.c	modified	+2	−2	View file
sound/pci/emu10k1/emu10k1x.c	modified	+2	−4	View file
sound/pci/emu10k1/emufx.c	modified	+44	−15	View file
sound/pci/emu10k1/emupcm.c	modified	+2	−1	View file
sound/pci/emu10k1/irq.c	modified	+1	−1	View file
sound/pci/emu10k1/memory.c	modified	+3	−3	View file
sound/pci/emu10k1/p16v.c	modified	+1	−1	View file
sound/pci/ens1370.c	modified	+8	−9	View file
sound/pci/es1938.c	modified	+25	−13	View file
sound/pci/es1968.c	modified	+10	−12	View file
sound/pci/fm801.c	modified	+11	−14	View file
sound/pci/hda/hda_codec.c	modified	+52	−0	View file
sound/pci/hda/hda_codec.h	modified	+2	−0	View file
sound/pci/hda/hda_intel.c	modified	+40	−32	View file
sound/pci/hda/hda_local.h	modified	+22	−0	View file
sound/pci/hda/hda_proc.c	modified	+5	−0	View file
sound/pci/hda/patch_analog.c	modified	+101	−32	View file
sound/pci/hda/patch_realtek.c	modified	+178	−96	View file
sound/pci/hda/patch_si3054.c	modified	+1	−1	View file
sound/pci/ice1712/aureon.c	modified	+3	−3	View file
sound/pci/ice1712/delta.c	modified	+1	−1	View file
sound/pci/ice1712/ews.c	modified	+3	−3	View file
sound/pci/ice1712/ice1712.c	modified	+5	−5	View file
sound/pci/ice1712/ice1724.c	modified	+30	−13	View file
sound/pci/ice1712/pontis.c	modified	+1	−2	View file
sound/pci/ice1712/revo.c	modified	+0	−13	View file
sound/pci/ice1712/vt1720_mobo.c	modified	+18	−2	View file
sound/pci/intel8x0.c	modified	+86	−74	View file
sound/pci/intel8x0m.c	modified	+23	−32	View file
sound/pci/maestro3.c	modified	+9	−12	View file
sound/pci/mixart/mixart.c	modified	+1	−2	View file
sound/pci/nm256/nm256.c	modified	+75	−70	View file
sound/pci/rme32.c	modified	+2	−2	View file
sound/pci/rme96.c	modified	+2	−2	View file
sound/pci/rme9652/hdsp.c	modified	+217	−371	View file
sound/pci/rme9652/hdspm.c	modified	+1	−2	View file
sound/pci/rme9652/rme9652.c	modified	+3	−3	View file
sound/pci/sonicvibes.c	modified	+9	−15	View file
sound/pci/trident/trident_main.c	modified	+9	−9	View file
sound/pci/trident/trident_memory.c	modified	+2	−2	View file
sound/pci/via82xx.c	modified	+254	−121	View file
sound/pci/via82xx_modem.c	modified	+20	−29	View file
sound/pci/ymfpci/ymfpci.c	modified	+5	−13	View file
sound/pci/ymfpci/ymfpci_main.c	modified	+36	−39	View file
sound/pcmcia/pdaudiocf/pdaudiocf_pcm.c	modified	+3	−3	View file
sound/ppc/beep.c	modified	+0	−2	View file
sound/ppc/pmac.c	modified	+10	−6	View file
sound/sparc/dbri.c	modified	+1	−4	View file
sound/synth/emux/emux_synth.c	modified	+0	−1	View file
sound/usb/usbaudio.c	modified	+75	−69	View file
sound/usb/usbaudio.h	modified	+0	−8	View file
sound/usb/usbmidi.c	modified	+46	−52	View file
sound/usb/usbmixer.c	modified	+1	−1	View file
sound/usb/usbquirks.h	modified	+39	−1	View file
sound/usb/usx2y/usX2Yhwdep.c	modified	+5	−5	View file
sound/usb/usx2y/usbusx2y.c	modified	+2	−3	View file
sound/usb/usx2y/usbusx2yaudio.c	modified	+11	−12	View file
sound/usb/usx2y/usx2yhwdeppcm.c	modified	+2	−2	View file

Only the first 600 diff lines are shown. Download the complete patch.

Documentation/sound/alsa/ALSA-Configuration.txt

View file

diff --git a/Documentation/sound/alsa/ALSA-Configuration.txt b/Documentation/sound/alsa/ALSA-Configuration.txt
index 13cba95..2f27f39 100644
--- a/Documentation/sound/alsa/ALSA-Configuration.txt
+++ b/Documentation/sound/alsa/ALSA-Configuration.txt
@@ -167,7 +167,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
     spdif           - Support SPDIF I/O
     		    - Default: disabled
 
-    Module supports autoprobe and multiple chips (max 8).
+    This module supports one chip and autoprobe.
 
     The power-management is supported.
 
@@ -206,7 +206,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
 			  See "AC97 Quirk Option" section below.
     spdif_aclink	- S/PDIF transfer over AC-link (default = 1)
 
-    This module supports up to 8 cards and autoprobe.
+    This module supports one card and autoprobe.
 
     ATI IXP has two different methods to control SPDIF output.  One is
     over AC-link and another is over the "direct" SPDIF output.  The
@@ -218,7 +218,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
 
     Module for ATI IXP 150/200/250 AC97 modem controllers.
 
-    Module supports up to 8 cards.
+    This module supports one card and autoprobe.
 
     Note: The default index value of this module is -2, i.e. the first
           slot is excluded.
@@ -637,7 +637,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
     model	- force the model name
     position_fix - Fix DMA pointer (0 = auto, 1 = none, 2 = POSBUF, 3 = FIFO size)
 
-    Module supports up to 8 cards.
+    This module supports one card and autoprobe.
 
     Each codec may have a model table for different configurations.
     If your machine isn't listed there, the default (usually minimal)
@@ -663,6 +663,10 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
 			adjusted.  Appearing only when compiled with
 			$CONFIG_SND_DEBUG=y
 
+	ALC260
+	  hp		HP machines
+	  fujitsu	Fujitsu S7020
+
 	CMI9880
 	  minimal	3-jack in back
 	  min_fp	3-jack in back, 2-jack in front
@@ -811,7 +815,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
 		    semaphores (e.g. on some ASUS laptops)
 		    (default off)
 
-    Module supports autoprobe and multiple bus-master chips (max 8).
+    This module supports one chip and autoprobe.
 
     Note: the latest driver supports auto-detection of chip clock.
     if you still encounter too fast playback, specify the clock
@@ -830,7 +834,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
 
     ac97_clock	  - AC'97 codec clock base (0 = auto-detect)
 
-    This module supports up to 8 cards and autoprobe.
+    This module supports one card and autoprobe.
 
     Note: The default index value of this module is -2, i.e. the first
           slot is excluded.
@@ -950,8 +954,10 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
     use_cache        - 0 or 1 (disabled by default)
     vaio_hack        - alias buffer_top=0x25a800
     reset_workaround - enable AC97 RESET workaround for some laptops
+    reset_workaround2 - enable extended AC97 RESET workaround for some
+		      other laptops
 
-    Module supports autoprobe and multiple chips (max 8).
+    This module supports one chip and autoprobe.
 
     The power-management is supported.
 
@@ -980,6 +986,11 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
     workaround is enabled automatically.  For other laptops with a
     hard freeze, you can try reset_workaround=1 option.
 
+    Note: Dell Latitude CSx laptops have another problem regarding
+    AC97 RESET.  On these laptops, reset_workaround2 option is
+    turned on as default.  This option is worth to try if the
+    previous reset_workaround option doesn't help.
+
     Note: This driver is really crappy.  It's a porting from the
     OSS driver, which is a result of black-magic reverse engineering.
     The detection of codec will fail if the driver is loaded *after*
@@ -1310,7 +1321,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
     ac97_quirk  - AC'97 workaround for strange hardware
 		  See "AC97 Quirk Option" section below.
 
-    Module supports autoprobe and multiple bus-master chips (max 8).
+    This module supports one chip and autoprobe.
 
     Note: on some SMP motherboards like MSI 694D the interrupts might
           not be generated properly.  In such a case, please try to
@@ -1352,7 +1363,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
 
     ac97_clock	- AC'97 codec clock base (default 48000Hz)
 
-    Module supports up to 8 cards.
+    This module supports one card and autoprobe.
 
     Note: The default index value of this module is -2, i.e. the first
           slot is excluded.

Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl

View file

diff --git a/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl b/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl
index 24e8552..260334c 100644
--- a/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl
+++ b/Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl
@@ -18,8 +18,8 @@
       </affiliation>
      </author>
 
-     <date>March 6, 2005</date>
-     <edition>0.3.4</edition>
+     <date>October 6, 2005</date>
+     <edition>0.3.5</edition>
 
     <abstract>
       <para>
@@ -30,7 +30,7 @@
 
     <legalnotice>
     <para>
-    Copyright (c) 2002-2004  Takashi Iwai <email>[email protected]</email>
+    Copyright (c) 2002-2005  Takashi Iwai <email>[email protected]</email>
     </para>
 
     <para>
@@ -1433,25 +1433,10 @@
         <informalexample>
           <programlisting>
 <![CDATA[
-  if (chip->res_port) {
-          release_resource(chip->res_port);
-          kfree_nocheck(chip->res_port);
-  }
+  release_and_free_resource(chip->res_port);
 ]]>
           </programlisting>
         </informalexample>
-
-      As you can see, the resource pointer is also to be freed
-      via <function>kfree_nocheck()</function> after
-      <function>release_resource()</function> is called. You
-      cannot use <function>kfree()</function> here, because on ALSA,
-      <function>kfree()</function> may be a wrapper to its own
-      allocator with the memory debugging. Since the resource pointer
-      is allocated externally outside the ALSA, it must be released
-      via the native
-      <function>kfree()</function>.
-      <function>kfree_nocheck()</function> is used for that; it calls
-      the native <function>kfree()</function> without wrapper. 
       </para>
 
       <para>
@@ -2190,8 +2175,7 @@ struct _snd_pcm_runtime {
 	unsigned int rate_den;
 
 	/* -- SW params -- */
-	int tstamp_timespec;		/* use timeval (0) or timespec (1) */
-	snd_pcm_tstamp_t tstamp_mode;	/* mmap timestamp is updated */
+	struct timespec tstamp_mode;	/* mmap timestamp is updated */
   	unsigned int period_step;
 	unsigned int sleep_min;		/* min ticks to sleep */
 	snd_pcm_uframes_t xfer_align;	/* xfer size need to be a multiple */
@@ -3709,8 +3693,7 @@ struct _snd_pcm_runtime {
         <para>
           Here, the chip instance is retrieved via
         <function>snd_kcontrol_chip()</function> macro.  This macro
-        converts from kcontrol-&gt;private_data to the type defined by
-        <type>chip_t</type>. The
+        just accesses to kcontrol-&gt;private_data. The
         kcontrol-&gt;private_data field is 
         given as the argument of <function>snd_ctl_new()</function>
         (see the later subsection
@@ -5998,32 +5981,23 @@ struct _snd_pcm_runtime {
         The first argument is the expression to evaluate, and the
       second argument is the action if it fails. When
       <constant>CONFIG_SND_DEBUG</constant>, is set, it will show an
-      error message such as <computeroutput>BUG? (xxx) (called from
-      yyy)</computeroutput>. When no debug flag is set, this is
-      ignored. 
+      error message such as <computeroutput>BUG? (xxx)</computeroutput>
+      together with stack trace.
       </para>
-    </section>
-
-    <section id="useful-functions-snd-runtime-check">
-      <title><function>snd_runtime_check()</function></title>
       <para>
-        This macro is quite similar with
-      <function>snd_assert()</function>. Unlike
-      <function>snd_assert()</function>, the expression is always
-      evaluated regardless of
-      <constant>CONFIG_SND_DEBUG</constant>. When
-      <constant>CONFIG_SND_DEBUG</constant> is set, the macro will
-      show a message like <computeroutput>ERROR (xx) (called from
-      yyy)</computeroutput>. 
+	 When no debug flag is set, this macro is ignored. 
       </para>
     </section>
 
     <section id="useful-functions-snd-bug">
       <title><function>snd_BUG()</function></title>
       <para>
-        It calls <function>snd_assert(0,)</function> -- that is, just
-      prints the error message at the point. It's useful to show that
-      a fatal error happens there. 
+        It shows <computeroutput>BUG?</computeroutput> message and
+      stack trace as well as <function>snd_assert</function> at the point.
+      It's useful to show that a fatal error happens there. 
+      </para>
+      <para>
+	 When no debug flag is set, this macro is ignored. 
       </para>
     </section>
   </chapter>

drivers/char/rtc.c

View file

diff --git a/drivers/char/rtc.c b/drivers/char/rtc.c
index 63fff7c..a7f099f 100644
--- a/drivers/char/rtc.c
+++ b/drivers/char/rtc.c
@@ -149,8 +149,22 @@ static void get_rtc_alm_time (struct rtc_time *alm_tm);
 #ifdef RTC_IRQ
 static void rtc_dropped_irq(unsigned long data);
 
-static void set_rtc_irq_bit(unsigned char bit);
-static void mask_rtc_irq_bit(unsigned char bit);
+static void set_rtc_irq_bit_locked(unsigned char bit);
+static void mask_rtc_irq_bit_locked(unsigned char bit);
+
+static inline void set_rtc_irq_bit(unsigned char bit)
+{
+	spin_lock_irq(&rtc_lock);
+	set_rtc_irq_bit_locked(bit);
+	spin_unlock_irq(&rtc_lock);
+}
+
+static void mask_rtc_irq_bit(unsigned char bit)
+{
+	spin_lock_irq(&rtc_lock);
+	mask_rtc_irq_bit_locked(bit);
+	spin_unlock_irq(&rtc_lock);
+}
 #endif
 
 static int rtc_proc_open(struct inode *inode, struct file *file);
@@ -401,18 +415,19 @@ static int rtc_do_ioctl(unsigned int cmd, unsigned long arg, int kernel)
 	}
 	case RTC_PIE_OFF:	/* Mask periodic int. enab. bit	*/
 	{
-		mask_rtc_irq_bit(RTC_PIE);
+		unsigned long flags; /* can be called from isr via rtc_control() */
+		spin_lock_irqsave (&rtc_lock, flags);
+		mask_rtc_irq_bit_locked(RTC_PIE);
 		if (rtc_status & RTC_TIMER_ON) {
-			spin_lock_irq (&rtc_lock);
 			rtc_status &= ~RTC_TIMER_ON;
 			del_timer(&rtc_irq_timer);
-			spin_unlock_irq (&rtc_lock);
 		}
+		spin_unlock_irqrestore (&rtc_lock, flags);
 		return 0;
 	}
 	case RTC_PIE_ON:	/* Allow periodic ints		*/
 	{
-
+		unsigned long flags; /* can be called from isr via rtc_control() */
 		/*
 		 * We don't really want Joe User enabling more
 		 * than 64Hz of interrupts on a multi-user machine.
@@ -421,14 +436,14 @@ static int rtc_do_ioctl(unsigned int cmd, unsigned long arg, int kernel)
 			(!capable(CAP_SYS_RESOURCE)))
 			return -EACCES;
 
+		spin_lock_irqsave (&rtc_lock, flags);
 		if (!(rtc_status & RTC_TIMER_ON)) {
-			spin_lock_irq (&rtc_lock);
 			rtc_irq_timer.expires = jiffies + HZ/rtc_freq + 2*HZ/100;
 			add_timer(&rtc_irq_timer);
 			rtc_status |= RTC_TIMER_ON;
-			spin_unlock_irq (&rtc_lock);
 		}
-		set_rtc_irq_bit(RTC_PIE);
+		set_rtc_irq_bit_locked(RTC_PIE);
+		spin_unlock_irqrestore (&rtc_lock, flags);
 		return 0;
 	}
 	case RTC_UIE_OFF:	/* Mask ints from RTC updates.	*/
@@ -609,6 +624,7 @@ static int rtc_do_ioctl(unsigned int cmd, unsigned long arg, int kernel)
 	{
 		int tmp = 0;
 		unsigned char val;
+		unsigned long flags; /* can be called from isr via rtc_control() */
 
 		/* 
 		 * The max we can do is 8192Hz.
@@ -631,9 +647,9 @@ static int rtc_do_ioctl(unsigned int cmd, unsigned long arg, int kernel)
 		if (arg != (1<<tmp))
 			return -EINVAL;
 
-		spin_lock_irq(&rtc_lock);
+		spin_lock_irqsave(&rtc_lock, flags);
 		if (hpet_set_periodic_freq(arg)) {
-			spin_unlock_irq(&rtc_lock);
+			spin_unlock_irqrestore(&rtc_lock, flags);
 			return 0;
 		}
 		rtc_freq = arg;
@@ -641,7 +657,7 @@ static int rtc_do_ioctl(unsigned int cmd, unsigned long arg, int kernel)
 		val = CMOS_READ(RTC_FREQ_SELECT) & 0xf0;
 		val |= (16 - tmp);
 		CMOS_WRITE(val, RTC_FREQ_SELECT);
-		spin_unlock_irq(&rtc_lock);
+		spin_unlock_irqrestore(&rtc_lock, flags);
 		return 0;
 	}
 #endif
@@ -844,12 +860,15 @@ int rtc_control(rtc_task_t *task, unsigned int cmd, unsigned long arg)
 #ifndef RTC_IRQ
 	return -EIO;
 #else
-	spin_lock_irq(&rtc_task_lock);
+	unsigned long flags;
+	if (cmd != RTC_PIE_ON && cmd != RTC_PIE_OFF && cmd != RTC_IRQP_SET)
+		return -EINVAL;
+	spin_lock_irqsave(&rtc_task_lock, flags);
 	if (rtc_callback != task) {
-		spin_unlock_irq(&rtc_task_lock);
+		spin_unlock_irqrestore(&rtc_task_lock, flags);
 		return -ENXIO;
 	}
-	spin_unlock_irq(&rtc_task_lock);
+	spin_unlock_irqrestore(&rtc_task_lock, flags);
 	return rtc_do_ioctl(cmd, arg, 1);
 #endif
 }
@@ -1306,40 +1325,32 @@ static void get_rtc_alm_time(struct rtc_time *alm_tm)
  * meddles with the interrupt enable/disable bits.
  */
 
-static void mask_rtc_irq_bit(unsigned char bit)
+static void mask_rtc_irq_bit_locked(unsigned char bit)
 {
 	unsigned char val;
 
-	spin_lock_irq(&rtc_lock);
-	if (hpet_mask_rtc_irq_bit(bit)) {
-		spin_unlock_irq(&rtc_lock);
+	if (hpet_mask_rtc_irq_bit(bit))
 		return;
-	}
 	val = CMOS_READ(RTC_CONTROL);
 	val &=  ~bit;
 	CMOS_WRITE(val, RTC_CONTROL);
 	CMOS_READ(RTC_INTR_FLAGS);
 
 	rtc_irq_data = 0;
-	spin_unlock_irq(&rtc_lock);
 }
 
-static void set_rtc_irq_bit(unsigned char bit)
+static void set_rtc_irq_bit_locked(unsigned char bit)
 {
 	unsigned char val;
 
-	spin_lock_irq(&rtc_lock);
-	if (hpet_set_rtc_irq_bit(bit)) {
-		spin_unlock_irq(&rtc_lock);
+	if (hpet_set_rtc_irq_bit(bit))
 		return;
-	}
 	val = CMOS_READ(RTC_CONTROL);
 	val |= bit;
 	CMOS_WRITE(val, RTC_CONTROL);
 	CMOS_READ(RTC_INTR_FLAGS);
 
 	rtc_irq_data = 0;
-	spin_unlock_irq(&rtc_lock);
 }
 #endif
 

include/sound/ac97_codec.h

View file

diff --git a/include/sound/ac97_codec.h b/include/sound/ac97_codec.h
index d11f348..7f0ca79 100644
--- a/include/sound/ac97_codec.h
+++ b/include/sound/ac97_codec.h
@@ -387,15 +387,6 @@
 #define AC97_RATES_MIC_ADC	4
 #define AC97_RATES_SPDIF	5
 
-/* shared controllers */
-enum {
-	AC97_SHARED_TYPE_NONE,
-	AC97_SHARED_TYPE_ICH,
-	AC97_SHARED_TYPE_ATIIXP,
-	AC97_SHARED_TYPE_VIA,
-	AC97_SHARED_TYPES
-};
-
 /*
  *
  */
@@ -468,7 +459,6 @@ struct _snd_ac97_bus {
 	unsigned short used_slots[2][4]; /* actually used PCM slots */
 	unsigned short pcms_count; /* count of PCMs */
 	struct ac97_pcm *pcms;
-	unsigned int shared_type;	/* type of shared controller betwen audio and modem */
 	ac97_t *codec[4];
 	snd_info_entry_t *proc;
 };

include/sound/core.h

View file

diff --git a/include/sound/core.h b/include/sound/core.h
index 6d971a4..2be65ad 100644
--- a/include/sound/core.h
+++ b/include/sound/core.h
@@ -29,7 +29,6 @@
 #include <linux/pm.h>			/* pm_message_t */
 
 /* Typedef's */
-typedef struct timespec snd_timestamp_t;
 typedef struct sndrv_interval snd_interval_t;
 typedef enum sndrv_card_type snd_card_type;
 typedef struct sndrv_xferi snd_xferi_t;
@@ -256,6 +255,7 @@ typedef struct _snd_minor snd_minor_t;
 
 /* sound.c */
 
+extern int snd_major;
 extern int snd_ecards_limit;
 
 void snd_request_card(int card);
@@ -285,39 +285,6 @@ int snd_oss_init_module(void);
 
 /* memory.c */
 
-#ifdef CONFIG_SND_DEBUG_MEMORY
-void snd_memory_init(void);
-void snd_memory_done(void);
-int snd_memory_info_init(void);
-int snd_memory_info_done(void);
-void *snd_hidden_kmalloc(size_t size, gfp_t flags);
-void *snd_hidden_kzalloc(size_t size, gfp_t flags);
-void *snd_hidden_kcalloc(size_t n, size_t size, gfp_t flags);
-void snd_hidden_kfree(const void *obj);
-void *snd_hidden_vmalloc(unsigned long size);
-void snd_hidden_vfree(void *obj);
-char *snd_hidden_kstrdup(const char *s, gfp_t flags);
-#define kmalloc(size, flags) snd_hidden_kmalloc(size, flags)
-#define kzalloc(size, flags) snd_hidden_kzalloc(size, flags)
-#define kcalloc(n, size, flags) snd_hidden_kcalloc(n, size, flags)
-#define kfree(obj) snd_hidden_kfree(obj)
-#define vmalloc(size) snd_hidden_vmalloc(size)
-#define vfree(obj) snd_hidden_vfree(obj)
-#define kmalloc_nocheck(size, flags) snd_wrapper_kmalloc(size, flags)
-#define vmalloc_nocheck(size) snd_wrapper_vmalloc(size)
-#define kfree_nocheck(obj) snd_wrapper_kfree(obj)
-#define vfree_nocheck(obj) snd_wrapper_vfree(obj)
-#define kstrdup(s, flags)  snd_hidden_kstrdup(s, flags)
-#else
-#define snd_memory_init() /*NOP*/
-#define snd_memory_done() /*NOP*/
-#define snd_memory_info_init() /*NOP*/
-#define snd_memory_info_done() /*NOP*/
-#define kmalloc_nocheck(size, flags) kmalloc(size, flags)
-#define vmalloc_nocheck(size) vmalloc(size)
-#define kfree_nocheck(obj) kfree(obj)
-#define vfree_nocheck(obj) vfree(obj)
-#endif
 int copy_to_user_fromio(void __user *dst, const volatile void __iomem *src, size_t count);
 int copy_from_user_toio(volatile void __iomem *dst, const void __user *src, size_t count);
 
@@ -373,8 +340,9 @@ unsigned int snd_dma_pointer(unsigned long dma, unsigned int size);
 #endif
 
 /* misc.c */
+struct resource;
+void release_and_free_resource(struct resource *res);
 
-int snd_task_name(struct task_struct *task, char *name, size_t size);
 #ifdef CONFIG_SND_VERBOSE_PRINTK
 void snd_verbose_printk(const char *file, int line, const char *format, ...)
      __attribute__ ((format (printf, 3, 4)));
@@ -429,34 +397,24 @@ void snd_verbose_printd(const char *file, int line, const char *format, ...)
  * When CONFIG_SND_DEBUG is not set, the expression is executed but
  * not checked.
  */
-#define snd_assert(expr, args...) do {\
-	if (unlikely(!(expr))) {				\
-		snd_printk(KERN_ERR "BUG? (%s) (called from %p)\n", __ASTRING__(expr), __builtin_return_address(0));\
-		args;\
-	}\
+#define snd_assert(expr, args...) do {					\
+	if (unlikely(!(expr))) {					\
+		snd_printk(KERN_ERR "BUG? (%s)\n", __ASTRING__(expr));	\
+		dump_stack();						\
+		args;							\
+	}								\
 } while (0)
-/**
- * snd_runtime_check - run-time assertion macro
- * @expr: expression
- * @args...: the action
- *
- * This macro checks the expression in run-time and invokes the commands
- * given in the rest arguments if the assertion is failed.
- * Unlike snd_assert(), the action commands are executed even if
- * CONFIG_SND_DEBUG is not set but without any error messages.
- */
-#define snd_runtime_check(expr, args...) do {\
-	if (unlikely(!(expr))) {				\
-		snd_printk(KERN_ERR "ERROR (%s) (called from %p)\n", __ASTRING__(expr), __builtin_return_address(0));\
-		args;\
-	}\
+
+#define snd_BUG() do {				\
+	snd_printk(KERN_ERR "BUG?\n");		\
+	dump_stack();				\
 } while (0)
 
 #else /* !CONFIG_SND_DEBUG */
 
 #define snd_printd(fmt, args...)	/* nothing */
 #define snd_assert(expr, args...)	(void)(expr)
-#define snd_runtime_check(expr, args...) do { if (!(expr)) { args; } } while (0)
+#define snd_BUG()			/* nothing */
 
 #endif /* CONFIG_SND_DEBUG */
 
@@ -473,30 +431,6 @@ void snd_verbose_printd(const char *file, int line, const char *format, ...)
 #define snd_printdd(format, args...) /* nothing */
 #endif
 
-#define snd_BUG() snd_assert(0, )
-
-
-static inline void snd_timestamp_now(struct timespec *tstamp, int timespec)
-{
-	struct timeval val;
-	/* FIXME: use a linear time source */
-	do_gettimeofday(&val);
-	tstamp->tv_sec = val.tv_sec;
-	tstamp->tv_nsec = val.tv_usec;
-	if (timespec)
-		tstamp->tv_nsec *= 1000L;
-}
-
-static inline void snd_timestamp_zero(struct timespec *tstamp)
-{
-	tstamp->tv_sec = 0;
-	tstamp->tv_nsec = 0;
-}
-
-static inline int snd_timestamp_null(struct timespec *tstamp)
-{
-	return tstamp->tv_sec == 0 && tstamp->tv_nsec == 0;
-}
 
 #define SNDRV_OSS_VERSION         ((3<<16)|(8<<8)|(1<<4)|(0))	/* 3.8.1a */
 

include/sound/driver.h

View file

diff --git a/include/sound/driver.h b/include/sound/driver.h
index 1ec2fae..3f0416a 100644
--- a/include/sound/driver.h
+++ b/include/sound/driver.h
@@ -44,21 +44,4 @@
 
 #include <linux/module.h>
 
-/*
- *  ==========================================================================
- */
-
-#ifdef CONFIG_SND_DEBUG_MEMORY
-#include <linux/slab.h>
-#include <linux/vmalloc.h>
-void *snd_wrapper_kmalloc(size_t, gfp_t);
-#undef kmalloc
-void snd_wrapper_kfree(const void *);
-#undef kfree
-void *snd_wrapper_vmalloc(size_t);
-#undef vmalloc
-void snd_wrapper_vfree(void *);
-#undef vfree
-#endif
-
 #endif /* __SOUND_DRIVER_H */

include/sound/emu10k1.h

View file

diff --git a/include/sound/emu10k1.h b/include/sound/emu10k1.h
index 46e3c0b..8411c7e 100644
--- a/include/sound/emu10k1.h
+++ b/include/sound/emu10k1.h
@@ -48,7 +48,8 @@
 
 /* FIXME? - according to the OSS driver the EMU10K1 needs a 29 bit DMA mask */
 #define EMU10K1_DMA_MASK	0x7fffffffUL	/* 31bit */
-#define AUDIGY_DMA_MASK		0xffffffffUL	/* 32bit */
+#define AUDIGY_DMA_MASK		0x7fffffffUL	/* 31bit FIXME - 32 should work? */

This diff is incomplete. Download the complete patch.