git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
sound
/
oss
/
sb_common.c
diff --git
a/sound/oss/sb_common.c
b/sound/oss/sb_common.c
index
e33a50e
..
07cbacf
100644
(file)
--- a/
sound/oss/sb_common.c
+++ b/
sound/oss/sb_common.c
@@
-1,5
+1,5
@@
/*
/*
- * sound/sb_common.c
+ * sound/
oss/
sb_common.c
*
* Common routines for Sound Blaster compatible cards.
*
*
* Common routines for Sound Blaster compatible cards.
*
@@
-26,7
+26,6
@@
* Chris Rankin <rankinc@zipworld.com.au>
*/
* Chris Rankin <rankinc@zipworld.com.au>
*/
-#include <linux/config.h>
#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/module.h>
@@
-67,7
+66,7
@@
void *smw_free;
static int jazz16_base; /* Not detected */
static unsigned char jazz16_bits; /* I/O relocation bits */
static int jazz16_base; /* Not detected */
static unsigned char jazz16_bits; /* I/O relocation bits */
-static
spinlock_t jazz16_lock = SPIN_LOCK_UNLOCKED
;
+static
DEFINE_SPINLOCK(jazz16_lock)
;
/*
* Logitech Soundman Wave specific initialization code
/*
* Logitech Soundman Wave specific initialization code
@@
-81,7
+80,7
@@
static int smw_ucodeLen;
#endif
#endif
-s
b_devc *last_sb;
/* Last sb loaded */
+s
tatic sb_devc *last_sb;
/* Last sb loaded */
int sb_dsp_command(sb_devc * devc, unsigned char val)
{
int sb_dsp_command(sb_devc * devc, unsigned char val)
{
@@
-133,7
+132,7
@@
static void sb_intr (sb_devc *devc)
if (src & 4) /* MPU401 interrupt */
if(devc->midi_irq_cookie)
if (src & 4) /* MPU401 interrupt */
if(devc->midi_irq_cookie)
- uart401intr(devc->irq, devc->midi_irq_cookie
, NULL
);
+ uart401intr(devc->irq, devc->midi_irq_cookie);
if (!(src & 3))
return; /* Not a DSP interrupt */
if (!(src & 3))
return; /* Not a DSP interrupt */
@@
-201,7
+200,7
@@
static void pci_intr(sb_devc *devc)
sb_intr(devc);
}
sb_intr(devc);
}
-static irqreturn_t sbintr(int irq, void *dev_id
, struct pt_regs *dummy
)
+static irqreturn_t sbintr(int irq, void *dev_id)
{
sb_devc *devc = dev_id;
{
sb_devc *devc = dev_id;
@@
-521,7
+520,7
@@
int sb_dsp_detect(struct address_info *hw_config, int pci, int pciio, struct sb_
DDB(printk("sb_dsp_detect(%x) entered\n", hw_config->io_base));
DDB(printk("sb_dsp_detect(%x) entered\n", hw_config->io_base));
-
devc->lock = SPIN_LOCK_UNLOCKED
;
+
spin_lock_init(&devc->lock)
;
devc->type = hw_config->card_subtype;
devc->base = hw_config->io_base;
devc->type = hw_config->card_subtype;
devc->base = hw_config->io_base;
@@
-626,7
+625,7
@@
int sb_dsp_detect(struct address_info *hw_config, int pci, int pciio, struct sb_
*/
*/
- detected_devc =
(sb_devc *)
kmalloc(sizeof(sb_devc), GFP_KERNEL);
+ detected_devc = kmalloc(sizeof(sb_devc), GFP_KERNEL);
if (detected_devc == NULL)
{
printk(KERN_ERR "sb: Can't allocate memory for device information\n");
if (detected_devc == NULL)
{
printk(KERN_ERR "sb: Can't allocate memory for device information\n");
@@
-678,7
+677,7
@@
int sb_dsp_init(struct address_info *hw_config, struct module *owner)
* will get shared PCI irq lines we must cope.
*/
* will get shared PCI irq lines we must cope.
*/
- int i=(devc->caps&SB_PCI_IRQ)?
SA_SHIRQ
:0;
+ int i=(devc->caps&SB_PCI_IRQ)?
IRQF_SHARED
:0;
if (request_irq(hw_config->irq, sbintr, i, "soundblaster", devc) < 0)
{
if (request_irq(hw_config->irq, sbintr, i, "soundblaster", devc) < 0)
{
@@
-876,14
+875,6
@@
int sb_dsp_init(struct address_info *hw_config, struct module *owner)
return 1;
}
return 1;
}
-void sb_dsp_disable_midi(int io_base)
-{
-}
-
-void sb_dsp_disable_recording(int io_base)
-{
-}
-
/* if (sbmpu) below we allow mpu401 to manage the midi devs
otherwise we have to unload them. (Andrzej Krzysztofowicz) */
/* if (sbmpu) below we allow mpu401 to manage the midi devs
otherwise we have to unload them. (Andrzej Krzysztofowicz) */
@@
-923,8
+914,8
@@
void sb_dsp_unload(struct address_info *hw_config, int sbmpu)
}
else
release_region(hw_config->io_base, 16);
}
else
release_region(hw_config->io_base, 16);
- if(detected_devc)
-
kfree(detected_devc);
+
+ kfree(detected_devc);
}
/*
}
/*
@@
-1292,7
+1283,6
@@
void unload_sbmpu(struct address_info *hw_config)
EXPORT_SYMBOL(sb_dsp_init);
EXPORT_SYMBOL(sb_dsp_detect);
EXPORT_SYMBOL(sb_dsp_unload);
EXPORT_SYMBOL(sb_dsp_init);
EXPORT_SYMBOL(sb_dsp_detect);
EXPORT_SYMBOL(sb_dsp_unload);
-EXPORT_SYMBOL(sb_dsp_disable_midi);
EXPORT_SYMBOL(sb_be_quiet);
EXPORT_SYMBOL(probe_sbmpu);
EXPORT_SYMBOL(unload_sbmpu);
EXPORT_SYMBOL(sb_be_quiet);
EXPORT_SYMBOL(probe_sbmpu);
EXPORT_SYMBOL(unload_sbmpu);