Pull bugzilla-7200 into release branch

[linux-2.6] / include / sound / sb.h

diff --git a/include/sound/sb.h b/include/sound/sb.h
index 8e82460c4d34c64453877b25de323d432614ed05..2dd5c8e5b4feabc027a48dfed2320421c26d4c26 100644 (file)
--- a/include/sound/sb.h
+++ b/include/sound/sb.h
@@ -100,13 +100,17 @@ struct snd_sb {
        struct snd_rawmidi *rmidi;
        struct snd_rawmidi_substream *midi_substream_input;
        struct snd_rawmidi_substream *midi_substream_output;
-       irqreturn_t (*rmidi_callback)(int irq, void *dev_id, struct pt_regs *regs);
+       irq_handler_t rmidi_callback;
 
        spinlock_t reg_lock;
        spinlock_t open_lock;
        spinlock_t midi_input_lock;
 
        struct snd_info_entry *proc_entry;
+
+#ifdef CONFIG_PM
+       unsigned char saved_regs[0x20];
+#endif
 };
 
 /* I/O ports */
@@ -282,7 +286,7 @@ int snd_sbdsp_reset(struct snd_sb *chip);
 int snd_sbdsp_create(struct snd_card *card,
                     unsigned long port,
                     int irq,
-                    irqreturn_t (*irq_handler)(int, void *, struct pt_regs *),
+                    irq_handler_t irq_handler,
                     int dma8, int dma16,
                     unsigned short hardware,
                     struct snd_sb **r_chip);
@@ -290,6 +294,10 @@ int snd_sbdsp_create(struct snd_card *card,
 void snd_sbmixer_write(struct snd_sb *chip, unsigned char reg, unsigned char data);
 unsigned char snd_sbmixer_read(struct snd_sb *chip, unsigned char reg);
 int snd_sbmixer_new(struct snd_sb *chip);
+#ifdef CONFIG_PM
+void snd_sbmixer_suspend(struct snd_sb *chip);
+void snd_sbmixer_resume(struct snd_sb *chip);
+#endif
 
 /* sb8_init.c */
 int snd_sb8dsp_pcm(struct snd_sb *chip, int device, struct snd_pcm ** rpcm);
@@ -308,7 +316,7 @@ int snd_sb16dsp_pcm(struct snd_sb *chip, int device, struct snd_pcm ** rpcm);
 const struct snd_pcm_ops *snd_sb16dsp_get_pcm_ops(int direction);
 int snd_sb16dsp_configure(struct snd_sb *chip);
 /* sb16.c */
-irqreturn_t snd_sb16dsp_interrupt(int irq, void *dev_id, struct pt_regs *regs);
+irqreturn_t snd_sb16dsp_interrupt(int irq, void *dev_id);
 
 /* exported mixer stuffs */
 enum {