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
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
sound
/
oss
/
mpu401.c
diff --git
a/sound/oss/mpu401.c
b/sound/oss/mpu401.c
index
0aac54c
..
2796c0e
100644
(file)
--- a/
sound/oss/mpu401.c
+++ b/
sound/oss/mpu401.c
@@
-1,5
+1,5
@@
/*
/*
- * sound/mpu401.c
+ * sound/
oss/
mpu401.c
*
* The low level driver for Roland MPU-401 compatible Midi cards.
*/
*
* The low level driver for Roland MPU-401 compatible Midi cards.
*/
@@
-432,19
+432,10
@@
static void mpu401_input_loop(struct mpu_config *devc)
devc->m_busy = 0;
}
devc->m_busy = 0;
}
-
int intchk_mpu401(
void *dev_id)
+
static irqreturn_t mpuintr(int irq,
void *dev_id)
{
struct mpu_config *devc;
{
struct mpu_config *devc;
- int dev = (int) dev_id;
-
- devc = &dev_conf[dev];
- return input_avail(devc);
-}
-
-irqreturn_t mpuintr(int irq, void *dev_id, struct pt_regs *dummy)
-{
- struct mpu_config *devc;
- int dev = (int) dev_id;
+ int dev = (int)(unsigned long) dev_id;
int handled = 0;
devc = &dev_conf[dev];
int handled = 0;
devc = &dev_conf[dev];
@@
-1032,7
+1023,7
@@
int attach_mpu401(struct address_info *hw_config, struct module *owner)
devc->capabilities |= MPU_CAP_INTLG; /* Supports intelligent mode */
devc->capabilities |= MPU_CAP_INTLG; /* Supports intelligent mode */
- mpu401_synth_operations[m] =
(struct synth_operations *)
kmalloc(sizeof(struct synth_operations), GFP_KERNEL);
+ mpu401_synth_operations[m] = kmalloc(sizeof(struct synth_operations), GFP_KERNEL);
if (mpu401_synth_operations[m] == NULL)
{
if (mpu401_synth_operations[m] == NULL)
{
@@
-1761,8
+1752,6
@@
static int mpu_timer_init(int midi_dev)
EXPORT_SYMBOL(probe_mpu401);
EXPORT_SYMBOL(attach_mpu401);
EXPORT_SYMBOL(unload_mpu401);
EXPORT_SYMBOL(probe_mpu401);
EXPORT_SYMBOL(attach_mpu401);
EXPORT_SYMBOL(unload_mpu401);
-EXPORT_SYMBOL(intchk_mpu401);
-EXPORT_SYMBOL(mpuintr);
static struct address_info cfg;
static struct address_info cfg;