3 files changed, 6 insertions, 5 deletions

diff --git a/sound/drivers/mpu401/mpu401.c b/sound/drivers/mpu401/mpu401.c
index d3cbbb047582..17cc105b26fc 100644
--- a/sound/drivers/mpu401/mpu401.c
+++ b/sound/drivers/mpu401/mpu401.c
@@ -83,7 +83,7 @@ static int snd_mpu401_create(int dev, struct snd_card **rcard)
         if ((err = snd_mpu401_uart_new(card, 0,
                                        MPU401_HW_MPU401,
                                        port[dev], 0,
-                                       irq[dev], irq[dev] >= 0 ? SA_INTERRUPT : 0, NULL)) < 0) {
+                                       irq[dev], irq[dev] >= 0 ? IRQF_DISABLED : 0, NULL)) < 0) {
                 printk(KERN_ERR "MPU401 not detected at 0x%lx\n", port[dev]);
                 goto _err;
         }
@@ -160,8 +160,9 @@ static int __devinit snd_mpu401_pnp(int dev, struct pnp_dev *device,
                 return -ENODEV;
         }
         if (pnp_port_len(device, 0) < IO_EXTENT) {
-                snd_printk(KERN_ERR "PnP port length is %ld, expected %d\n",
-                           pnp_port_len(device, 0), IO_EXTENT);
+                snd_printk(KERN_ERR "PnP port length is %llu, expected %d\n",
+                           (unsigned long long)pnp_port_len(device, 0),
+                           IO_EXTENT);
                 return -ENODEV;
         }
         port[dev] = pnp_port_start(device, 0);
diff --git a/sound/drivers/mtpav.c b/sound/drivers/mtpav.c
index 474eed06e70f..e064d6c5685b 100644
--- a/sound/drivers/mtpav.c
+++ b/sound/drivers/mtpav.c
@@ -590,7 +590,7 @@ static int __init snd_mtpav_get_ISA(struct mtpav * mcard)
                 return -EBUSY;
         }
         mcard->port = port;
-        if (request_irq(irq, snd_mtpav_irqh, SA_INTERRUPT, "MOTU MTPAV", mcard)) {
+        if (request_irq(irq, snd_mtpav_irqh, IRQF_DISABLED, "MOTU MTPAV", mcard)) {
                 snd_printk("MTVAP IRQ %d busy\n", irq);
                 return -EBUSY;
         }
diff --git a/sound/drivers/serial-u16550.c b/sound/drivers/serial-u16550.c
index 2330fec505da..52afb4bd2079 100644
--- a/sound/drivers/serial-u16550.c
+++ b/sound/drivers/serial-u16550.c
@@ -795,7 +795,7 @@ static int __init snd_uart16550_create(struct snd_card *card,
 
         if (irq >= 0 && irq != SNDRV_AUTO_IRQ) {
                 if (request_irq(irq, snd_uart16550_interrupt,
-                                SA_INTERRUPT, "Serial MIDI", (void *) uart)) {
+                                IRQF_DISABLED, "Serial MIDI", (void *) uart)) {
                         snd_printk("irq %d busy. Using Polling.\n", irq);
                 } else {
                         uart->irq = irq;