33 files changed, 151 insertions, 641 deletions

diff --git a/sound/arm/aaci.c b/sound/arm/aaci.c
index 5e9a81ab99..54147c1f63 100644
--- a/sound/arm/aaci.c
+++ b/sound/arm/aaci.c
@@ -17,11 +17,11 @@
 #include <linux/spinlock.h>
 #include <linux/interrupt.h>
 #include <linux/err.h>
+#include <linux/amba/bus.h>
 
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/sizes.h>
-#include <asm/hardware/amba.h>
 
 #include <sound/driver.h>
 #include <sound/core.h>
diff --git a/sound/core/oss/pcm_oss.c b/sound/core/oss/pcm_oss.c
index 16df1246a1..7fd072392c 100644
--- a/sound/core/oss/pcm_oss.c
+++ b/sound/core/oss/pcm_oss.c
@@ -2135,9 +2135,7 @@ static ssize_t snd_pcm_oss_write(struct file *file, const char __user *buf, size
         substream = pcm_oss_file->streams[SNDRV_PCM_STREAM_PLAYBACK];
         if (substream == NULL)
                 return -ENXIO;
-        up(&file->f_dentry->d_inode->i_sem);
         result = snd_pcm_oss_write1(substream, buf, count);
-        down(&file->f_dentry->d_inode->i_sem);
 #ifdef OSS_DEBUG
         printk("pcm_oss: write %li bytes (wrote %li bytes)\n", (long)count, (long)result);
 #endif
diff --git a/sound/core/seq/seq_memory.c b/sound/core/seq/seq_memory.c
index 9ee6c177db..40b4f679c8 100644
--- a/sound/core/seq/seq_memory.c
+++ b/sound/core/seq/seq_memory.c
@@ -32,10 +32,6 @@
 #include "seq_info.h"
 #include "seq_lock.h"
 
-/* semaphore in struct file record */
-#define semaphore_of(fp)        ((fp)->f_dentry->d_inode->i_sem)
-
-
 static inline int snd_seq_pool_available(struct snd_seq_pool *pool)
 {
         return pool->total_elements - atomic_read(&pool->counter);
diff --git a/sound/isa/wavefront/wavefront_synth.c b/sound/isa/wavefront/wavefront_synth.c
index 679d0ae97e..ed81eec6e7 100644
--- a/sound/isa/wavefront/wavefront_synth.c
+++ b/sound/isa/wavefront/wavefront_synth.c
@@ -115,18 +115,11 @@ MODULE_PARM_DESC(osrun_time, "how many seconds to wait for the ICS2115 OS");
 
 #ifdef WF_DEBUG
 
-#if defined(NEW_MACRO_VARARGS) || __GNUC__ >= 3
 #define DPRINT(cond, ...) \
        if ((dev->debug & (cond)) == (cond)) { \
              snd_printk (__VA_ARGS__); \
        }
 #else
-#define DPRINT(cond, args...) \
-       if ((dev->debug & (cond)) == (cond)) { \
-             snd_printk (args); \
-       }
-#endif
-#else
 #define DPRINT(cond, args...)
 #endif /* WF_DEBUG */
 
diff --git a/sound/oss/ad1848.c b/sound/oss/ad1848.c
index 3f30c57676..49796be955 100644
--- a/sound/oss/ad1848.c
+++ b/sound/oss/ad1848.c
@@ -46,8 +46,6 @@
 #include <linux/interrupt.h>
 #include <linux/module.h>
 #include <linux/stddef.h>
-#include <linux/pm.h>
-#include <linux/pm_legacy.h>
 #include <linux/isapnp.h>
 #include <linux/pnp.h>
 #include <linux/spinlock.h>
@@ -105,9 +103,6 @@ typedef struct
         int             irq_ok;
         mixer_ents     *mix_devices;
         int             mixer_output_port;
-
-        /* Power management */
-        struct          pm_dev *pmdev;
 } ad1848_info;
 
 typedef struct ad1848_port_info
@@ -201,7 +196,6 @@ static void     ad1848_halt(int dev);
 static void     ad1848_halt_input(int dev);
 static void     ad1848_halt_output(int dev);
 static void     ad1848_trigger(int dev, int bits);
-static int      ad1848_pm_callback(struct pm_dev *dev, pm_request_t rqst, void *data);
 
 #ifndef EXCLUDE_TIMERS
 static int ad1848_tmr_install(int dev);
@@ -2027,10 +2021,6 @@ int ad1848_init (char *name, struct resource *ports, int irq, int dma_playback,
 
         nr_ad1848_devs++;
 
-        devc->pmdev = pm_register(PM_ISA_DEV, my_dev, ad1848_pm_callback);
-        if (devc->pmdev)
-                devc->pmdev->data = devc;
-
         ad1848_init_hw(devc);
 
         if (irq > 0)
@@ -2197,9 +2187,6 @@ void ad1848_unload(int io_base, int irq, int dma_playback, int dma_capture, int
                 if(mixer>=0)
                         sound_unload_mixerdev(mixer);
 
-                if (devc->pmdev)
-                        pm_unregister(devc->pmdev);
-
                 nr_ad1848_devs--;
                 for ( ; i < nr_ad1848_devs ; i++)
                         adev_info[i] = adev_info[i+1];
@@ -2811,85 +2798,6 @@ static int ad1848_tmr_install(int dev)
 }
 #endif /* EXCLUDE_TIMERS */
 
-static int ad1848_suspend(ad1848_info *devc)
-{
-        unsigned long flags;
-
-        spin_lock_irqsave(&devc->lock,flags);
-
-        ad_mute(devc);
-        
-        spin_unlock_irqrestore(&devc->lock,flags);
-        return 0;
-}
-
-static int ad1848_resume(ad1848_info *devc)
-{
-        int mixer_levels[32], i;
-
-        /* Thinkpad is a bit more of PITA than normal. The BIOS tends to
-           restore it in a different config to the one we use.  Need to
-           fix this somehow */
-
-        /* store old mixer levels */
-        memcpy(mixer_levels, devc->levels, sizeof (mixer_levels));  
-        ad1848_init_hw(devc);
-
-        /* restore mixer levels */
-        for (i = 0; i < 32; i++)
-                ad1848_mixer_set(devc, devc->dev_no, mixer_levels[i]);
-
-        if (!devc->subtype) {
-                static signed char interrupt_bits[12] = { -1, -1, -1, -1, -1, 0x00, -1, 0x08, -1, 0x10, 0x18, 0x20 };
-                static char dma_bits[4] = { 1, 2, 0, 3 };
-                unsigned long flags;
-                signed char bits;
-                char dma2_bit = 0;
-
-                int config_port = devc->base + 0;
-
-                bits = interrupt_bits[devc->irq];
-                if (bits == -1) {
-                        printk(KERN_ERR "MSS: Bad IRQ %d\n", devc->irq);
-                        return -1;
-                }
-
-                spin_lock_irqsave(&devc->lock,flags);
-        
-                outb((bits | 0x40), config_port); 
-
-                if (devc->dma2 != -1 && devc->dma2 != devc->dma1)
-                        if ( (devc->dma1 == 0 && devc->dma2 == 1) ||
-                             (devc->dma1 == 1 && devc->dma2 == 0) ||
-                             (devc->dma1 == 3 && devc->dma2 == 0))
-                                dma2_bit = 0x04;
-
-                outb((bits | dma_bits[devc->dma1] | dma2_bit), config_port);
-                spin_unlock_irqrestore(&devc->lock,flags);
-        }
-
-        return 0;
-}
-
-static int ad1848_pm_callback(struct pm_dev *dev, pm_request_t rqst, void *data) 
-{
-        ad1848_info *devc = dev->data;
-        if (devc) {
-                DEB(printk("ad1848: pm event received: 0x%x\n", rqst));
-
-                switch (rqst) {
-                case PM_SUSPEND:
-                        ad1848_suspend(devc);
-                        break;
-                case PM_RESUME:
-                        ad1848_resume(devc);
-                        break;
-                }
-        }
-        return 0;
-}
-
-
 EXPORT_SYMBOL(ad1848_detect);
 EXPORT_SYMBOL(ad1848_init);
 EXPORT_SYMBOL(ad1848_unload);
diff --git a/sound/oss/ad1889.c b/sound/oss/ad1889.c
index 2cfd214e4c..a0d73f3431 100644
--- a/sound/oss/ad1889.c
+++ b/sound/oss/ad1889.c
@@ -1089,7 +1089,7 @@ static struct pci_driver ad1889_driver = {
 
 static int __init ad1889_init_module(void)
 {
-        return pci_module_init(&ad1889_driver);
+        return pci_register_driver(&ad1889_driver);
 }
 
 static void ad1889_exit_module(void)
diff --git a/sound/oss/btaudio.c b/sound/oss/btaudio.c
index a85093fec7..4007a5680a 100644
--- a/sound/oss/btaudio.c
+++ b/sound/oss/btaudio.c
@@ -1101,7 +1101,7 @@ static int btaudio_init_module(void)
                digital ? "digital" : "",
                analog && digital ? "+" : "",
                analog ? "analog" : "");
-        return pci_module_init(&btaudio_pci_driver);
+        return pci_register_driver(&btaudio_pci_driver);
 }
 
 static void btaudio_cleanup_module(void)
diff --git a/sound/oss/cmpci.c b/sound/oss/cmpci.c
index 74dcca78c6..7cfbb08db5 100644
--- a/sound/oss/cmpci.c
+++ b/sound/oss/cmpci.c
@@ -3366,7 +3366,7 @@ static struct pci_driver cm_driver = {
 static int __init init_cmpci(void)
 {
         printk(KERN_INFO "cmpci: version $Revision: 6.82 $ time " __TIME__ " " __DATE__ "\n");
-        return pci_module_init(&cm_driver);
+        return pci_register_driver(&cm_driver);
 }
 
 static void __exit cleanup_cmpci(void)
diff --git a/sound/oss/cs4281/cs4281m.c b/sound/oss/cs4281/cs4281m.c
index adc689649f..0720365f64 100644
--- a/sound/oss/cs4281/cs4281m.c
+++ b/sound/oss/cs4281/cs4281m.c
@@ -298,7 +298,6 @@ struct cs4281_state {
         struct cs4281_pipeline pl[CS4281_NUMBER_OF_PIPELINES];
 };
 
-#include <linux/pm_legacy.h>
 #include "cs4281pm-24.c"
 
 #if CSDEBUG
@@ -4256,9 +4255,6 @@ static void __devinit cs4281_InitPM(struct cs4281_state *s)
 static int __devinit cs4281_probe(struct pci_dev *pcidev,
                                   const struct pci_device_id *pciid)
 {
-#ifndef NOT_CS4281_PM
-        struct pm_dev *pmdev;
-#endif
         struct cs4281_state *s;
         dma_addr_t dma_mask;
         mm_segment_t fs;
@@ -4374,19 +4370,7 @@ static int __devinit cs4281_probe(struct pci_dev *pcidev,
         }
 #ifndef NOT_CS4281_PM
         cs4281_InitPM(s);
-        pmdev = cs_pm_register(PM_PCI_DEV, PM_PCI_ID(pcidev), cs4281_pm_callback);
-        if (pmdev)
-        {
-                CS_DBGOUT(CS_INIT | CS_PM, 4, printk(KERN_INFO
-                         "cs4281: probe() pm_register() succeeded (%p).\n", pmdev));
-                pmdev->data = s;
-        }
-        else
-        {
-                CS_DBGOUT(CS_INIT | CS_PM | CS_ERROR, 0, printk(KERN_INFO
-                         "cs4281: probe() pm_register() failed (%p).\n", pmdev));
-                s->pm.flags |= CS4281_PM_NOT_REGISTERED;
-        }
+        s->pm.flags |= CS4281_PM_NOT_REGISTERED;
 #endif
 
         pci_set_master(pcidev); // enable bus mastering 
@@ -4477,7 +4461,7 @@ static int __init cs4281_init_module(void)
         printk(KERN_INFO "cs4281: version v%d.%02d.%d time " __TIME__ " "
                __DATE__ "\n", CS4281_MAJOR_VERSION, CS4281_MINOR_VERSION,
                CS4281_ARCH);
-        rtn = pci_module_init(&cs4281_pci_driver);
+        rtn = pci_register_driver(&cs4281_pci_driver);
 
         CS_DBGOUT(CS_INIT | CS_FUNCTION, 2,
                   printk(KERN_INFO "cs4281: cs4281_init_module()- (%d)\n",rtn));
@@ -4487,9 +4471,6 @@ static int __init cs4281_init_module(void)
 static void __exit cs4281_cleanup_module(void)
 {
         pci_unregister_driver(&cs4281_pci_driver);
-#ifndef NOT_CS4281_PM
-        cs_pm_unregister_all(cs4281_pm_callback);
-#endif
         CS_DBGOUT(CS_INIT | CS_FUNCTION, 2,
                   printk(KERN_INFO "cs4281: cleanup_cs4281() finished\n"));
 }
diff --git a/sound/oss/cs4281/cs4281pm-24.c b/sound/oss/cs4281/cs4281pm-24.c
index d2a453aff0..90cbd76795 100644
--- a/sound/oss/cs4281/cs4281pm-24.c
+++ b/sound/oss/cs4281/cs4281pm-24.c
@@ -27,9 +27,6 @@
 #ifndef NOT_CS4281_PM
 #include <linux/pm.h>
 
-#define cs_pm_register(a, b, c) pm_register((a), (b), (c));
-#define cs_pm_unregister_all(a) pm_unregister_all((a));
-
 static int cs4281_suspend(struct cs4281_state *s);
 static int cs4281_resume(struct cs4281_state *s);
 /* 
@@ -41,42 +38,6 @@ static int cs4281_resume(struct cs4281_state *s);
 #define CS4281_SUSPEND_TBL cs4281_suspend_null
 #define CS4281_RESUME_TBL cs4281_resume_null
 
-static int cs4281_pm_callback(struct pm_dev *dev, pm_request_t rqst, void *data)
-{
-        struct cs4281_state *state;
-
-        CS_DBGOUT(CS_PM, 2, printk(KERN_INFO 
-                "cs4281: cs4281_pm_callback dev=%p rqst=0x%x state=%p\n",
-                        dev,(unsigned)rqst,data));
-        state = (struct cs4281_state *) dev->data;
-        if (state) {
-                switch(rqst) {
-                        case PM_SUSPEND:
-                                CS_DBGOUT(CS_PM, 2, printk(KERN_INFO
-                                        "cs4281: PM suspend request\n"));
-                                if(cs4281_suspend(state))
-                                {
-                                    CS_DBGOUT(CS_ERROR, 2, printk(KERN_INFO
-                                        "cs4281: PM suspend request refused\n"));
-                                        return 1; 
-                                }
-                                break;
-                        case PM_RESUME:
-                                CS_DBGOUT(CS_PM, 2, printk(KERN_INFO
-                                        "cs4281: PM resume request\n"));
-                                if(cs4281_resume(state))
-                                {
-                                    CS_DBGOUT(CS_ERROR, 2, printk(KERN_INFO
-                                        "cs4281: PM resume request refused\n"));
-                                        return 1;
-                                }
-                                break;
-                }
-        }
-
-        return 0;
-}
-
 #else /* CS4281_PM */
 #define CS4281_SUSPEND_TBL cs4281_suspend_null
 #define CS4281_RESUME_TBL cs4281_resume_null
diff --git a/sound/oss/cs46xx.c b/sound/oss/cs46xx.c
index cb998e8c0f..58e25c82ea 100644
--- a/sound/oss/cs46xx.c
+++ b/sound/oss/cs46xx.c
@@ -391,10 +391,6 @@ static void cs461x_clear_serial_FIFOs(struct cs_card *card, int type);
 static int cs46xx_suspend_tbl(struct pci_dev *pcidev, pm_message_t state);
 static int cs46xx_resume_tbl(struct pci_dev *pcidev);
 
-#ifndef CS46XX_ACPI_SUPPORT
-static int cs46xx_pm_callback(struct pm_dev *dev, pm_request_t rqst, void *data);
-#endif
-
 #if CSDEBUG
 
 /* DEBUG ROUTINES */
@@ -5320,7 +5316,6 @@ static const char fndmsg[] = KERN_INFO "cs46xx: Found %d audio device(s).\n";
 static int __devinit cs46xx_probe(struct pci_dev *pci_dev,
                                   const struct pci_device_id *pciid)
 {
-        struct pm_dev *pmdev;
         int i,j;
         u16 ss_card, ss_vendor;
         struct cs_card *card;
@@ -5530,22 +5525,6 @@ static int __devinit cs46xx_probe(struct pci_dev *pci_dev,
         PCI_SET_DMA_MASK(pci_dev, dma_mask);
         list_add(&card->list, &cs46xx_devs);
 
-        pmdev = cs_pm_register(PM_PCI_DEV, PM_PCI_ID(pci_dev), cs46xx_pm_callback);
-        if (pmdev)
-        {
-                CS_DBGOUT(CS_INIT | CS_PM, 4, printk(KERN_INFO
-                         "cs46xx: probe() pm_register() succeeded (%p).\n",
-                                pmdev));
-                pmdev->data = card;
-        }
-        else
-        {
-                CS_DBGOUT(CS_INIT | CS_PM | CS_ERROR, 2, printk(KERN_INFO
-                         "cs46xx: probe() pm_register() failed (%p).\n",
-                                pmdev));
-                card->pm.flags |= CS46XX_PM_NOT_REGISTERED;
-        }
-
         CS_DBGOUT(CS_PM, 9, printk(KERN_INFO "cs46xx: pm.flags=0x%x card=%p\n",
                 (unsigned)card->pm.flags,card));
 
@@ -5711,7 +5690,7 @@ static int __init cs46xx_init_module(void)
         int rtn = 0;
         CS_DBGOUT(CS_INIT | CS_FUNCTION, 2, printk(KERN_INFO 
                 "cs46xx: cs46xx_init_module()+ \n"));
-        rtn = pci_module_init(&cs46xx_pci_driver);
+        rtn = pci_register_driver(&cs46xx_pci_driver);
 
         if(rtn == -ENODEV)
         {
@@ -5727,7 +5706,6 @@ static int __init cs46xx_init_module(void)
 static void __exit cs46xx_cleanup_module(void)
 {
         pci_unregister_driver(&cs46xx_pci_driver);
-        cs_pm_unregister_all(cs46xx_pm_callback);
         CS_DBGOUT(CS_INIT | CS_FUNCTION, 2,
                   printk(KERN_INFO "cs46xx: cleanup_cs46xx() finished\n"));
 }
@@ -5735,44 +5713,6 @@ static void __exit cs46xx_cleanup_module(void)
 module_init(cs46xx_init_module);
 module_exit(cs46xx_cleanup_module);
 
-#ifndef CS46XX_ACPI_SUPPORT
-static int cs46xx_pm_callback(struct pm_dev *dev, pm_request_t rqst, void *data)
-{
-        struct cs_card *card;
-
-        CS_DBGOUT(CS_PM, 2, printk(KERN_INFO 
-                "cs46xx: cs46xx_pm_callback dev=%p rqst=0x%x card=%p\n",
-                        dev,(unsigned)rqst,data));
-        card = (struct cs_card *) dev->data;
-        if (card) {
-                switch(rqst) {
-                        case PM_SUSPEND:
-                                CS_DBGOUT(CS_PM, 2, printk(KERN_INFO
-                                        "cs46xx: PM suspend request\n"));
-                                if(cs46xx_suspend(card, PMSG_SUSPEND))
-                                {
-                                    CS_DBGOUT(CS_ERROR, 2, printk(KERN_INFO
-                                        "cs46xx: PM suspend request refused\n"));
-                                        return 1; 
-                                }
-                                break;
-                        case PM_RESUME:
-                                CS_DBGOUT(CS_PM, 2, printk(KERN_INFO
-                                        "cs46xx: PM resume request\n"));
-                                if(cs46xx_resume(card))
-                                {
-                                    CS_DBGOUT(CS_ERROR, 2, printk(KERN_INFO
-                                        "cs46xx: PM resume request refused\n"));
-                                        return 1;
-                                }
-                                break;
-                }
-        }
-
-        return 0;
-}
-#endif
-
 #if CS46XX_ACPI_SUPPORT
 static int cs46xx_suspend_tbl(struct pci_dev *pcidev, pm_message_t state)
 {
diff --git a/sound/oss/cs46xxpm-24.h b/sound/oss/cs46xxpm-24.h
index e220bd7240..ad82db84d0 100644
--- a/sound/oss/cs46xxpm-24.h
+++ b/sound/oss/cs46xxpm-24.h
@@ -38,13 +38,9 @@
 */
 static int cs46xx_suspend_tbl(struct pci_dev *pcidev, pm_message_t state);
 static int cs46xx_resume_tbl(struct pci_dev *pcidev);
-#define cs_pm_register(a, b, c)  NULL
-#define cs_pm_unregister_all(a) 
 #define CS46XX_SUSPEND_TBL cs46xx_suspend_tbl
 #define CS46XX_RESUME_TBL cs46xx_resume_tbl
 #else
-#define cs_pm_register(a, b, c) pm_register((a), (b), (c));
-#define cs_pm_unregister_all(a) pm_unregister_all((a));
 #define CS46XX_SUSPEND_TBL cs46xx_null
 #define CS46XX_RESUME_TBL cs46xx_null
 #endif
diff --git a/sound/oss/dmasound/dac3550a.c b/sound/oss/dmasound/dac3550a.c
index 533895eba0..7360d8954d 100644
--- a/sound/oss/dmasound/dac3550a.c
+++ b/sound/oss/dmasound/dac3550a.c
@@ -41,10 +41,10 @@ static int daca_detect_client(struct i2c_adapter *adapter, int address);
 static int daca_detach_client(struct i2c_client *client);
 
 struct i2c_driver daca_driver = {  
-        .owner                  = THIS_MODULE,
-        .name                   = "DAC3550A driver  V " DACA_VERSION,
+        .driver = {
+                .name           = "DAC3550A driver  V " DACA_VERSION,
+        },
         .id                     = I2C_DRIVERID_DACA,
-        .flags                  = I2C_DF_NOTIFY,
         .attach_adapter         = daca_attach_adapter,
         .detach_client          = daca_detach_client,
 };
diff --git a/sound/oss/dmasound/dmasound_awacs.c b/sound/oss/dmasound/dmasound_awacs.c
index cebd881b91..74f975676c 100644
--- a/sound/oss/dmasound/dmasound_awacs.c
+++ b/sound/oss/dmasound/dmasound_awacs.c
@@ -125,6 +125,7 @@ static int awacs_rate_index;
 static int awacs_subframe;
 static struct device_node* awacs_node;
 static struct device_node* i2s_node;
+static struct resource awacs_rsrc[3];
 
 static char awacs_name[64];
 static int awacs_revision;
@@ -667,9 +668,12 @@ static void PMacIrqCleanup(void)
         iounmap(awacs_txdma);
         iounmap(awacs_rxdma);
 
-        release_OF_resource(awacs_node, 0);
-        release_OF_resource(awacs_node, 1);
-        release_OF_resource(awacs_node, 2);
+        release_mem_region(awacs_rsrc[0].start,
+                           awacs_rsrc[0].end - awacs_rsrc[0].start + 1);
+        release_mem_region(awacs_rsrc[1].start,
+                           awacs_rsrc[1].end - awacs_rsrc[1].start + 1);
+        release_mem_region(awacs_rsrc[2].start,
+                           awacs_rsrc[2].end - awacs_rsrc[2].start + 1);
 
         kfree(awacs_tx_cmd_space);
         kfree(awacs_rx_cmd_space);
@@ -2863,46 +2867,58 @@ printk("dmasound_pmac: couldn't find a Codec we can handle\n");
          * other info if necessary (early AWACS we want to read chip ids)
          */
 
-        if (io->n_addrs < 3 || io->n_intrs < 3) {
+        if (of_get_address(io, 2, NULL, NULL) == NULL || io->n_intrs < 3) {
                 /* OK - maybe we need to use the 'awacs' node (on earlier
                  * machines).
-                */
+                 */
                 if (awacs_node) {
                         io = awacs_node ;
-                        if (io->n_addrs < 3 || io->n_intrs < 3) {
-                                printk("dmasound_pmac: can't use %s"
-                                        " (%d addrs, %d intrs)\n",
-                                 io->full_name, io->n_addrs, io->n_intrs);
+                        if (of_get_address(io, 2, NULL, NULL) == NULL ||
+                            io->n_intrs < 3) {
+                                printk("dmasound_pmac: can't use %s\n",
+                                       io->full_name);
                                 return -ENODEV;
                         }
-                } else {
-                        printk("dmasound_pmac: can't use %s (%d addrs, %d intrs)\n",
-                              io->full_name, io->n_addrs, io->n_intrs);
-                }
+                } else
+                        printk("dmasound_pmac: can't use %s\n", io->full_name);
         }
 
-        if (!request_OF_resource(io, 0, NULL)) {
+        if (of_address_to_resource(io, 0, &awacs_rsrc[0]) ||
+            request_mem_region(awacs_rsrc[0].start,
+                               awacs_rsrc[0].end - awacs_rsrc[0].start + 1,
+                               " (IO)") == NULL) {
                 printk(KERN_ERR "dmasound: can't request IO resource !\n");
                 return -ENODEV;
         }
-        if (!request_OF_resource(io, 1, " (tx dma)")) {
-                release_OF_resource(io, 0);
-                printk(KERN_ERR "dmasound: can't request TX DMA resource !\n");
+        if (of_address_to_resource(io, 1, &awacs_rsrc[1]) ||
+            request_mem_region(awacs_rsrc[1].start,
+                               awacs_rsrc[1].end - awacs_rsrc[1].start + 1,
+                               " (tx dma)") == NULL) {
+                release_mem_region(awacs_rsrc[0].start,
+                                   awacs_rsrc[0].end - awacs_rsrc[0].start + 1);
+                printk(KERN_ERR "dmasound: can't request Tx DMA resource !\n");
                 return -ENODEV;
         }
-
-        if (!request_OF_resource(io, 2, " (rx dma)")) {
-                release_OF_resource(io, 0);
-                release_OF_resource(io, 1);
-                printk(KERN_ERR "dmasound: can't request RX DMA resource !\n");
+        if (of_address_to_resource(io, 2, &awacs_rsrc[2]) ||
+            request_mem_region(awacs_rsrc[2].start,
+                               awacs_rsrc[2].end - awacs_rsrc[2].start + 1,
+                               " (rx dma)") == NULL) {
+                release_mem_region(awacs_rsrc[0].start,
+                                   awacs_rsrc[0].end - awacs_rsrc[0].start + 1);
+                release_mem_region(awacs_rsrc[1].start,
+                                   awacs_rsrc[1].end - awacs_rsrc[1].start + 1);
+                printk(KERN_ERR "dmasound: can't request Rx DMA resource !\n");
                 return -ENODEV;
         }
 
         awacs_beep_dev = input_allocate_device();
         if (!awacs_beep_dev) {
-                release_OF_resource(io, 0);
-                release_OF_resource(io, 1);
-                release_OF_resource(io, 2);
+                release_mem_region(awacs_rsrc[0].start,
+                                   awacs_rsrc[0].end - awacs_rsrc[0].start + 1);
+                release_mem_region(awacs_rsrc[1].start,
+                                   awacs_rsrc[1].end - awacs_rsrc[1].start + 1);
+                release_mem_region(awacs_rsrc[2].start,
+                                   awacs_rsrc[2].end - awacs_rsrc[2].start + 1);
                 printk(KERN_ERR "dmasound: can't allocate input device !\n");
                 return -ENOMEM;
         }
@@ -2916,11 +2932,11 @@ printk("dmasound_pmac: couldn't find a Codec we can handle\n");
 
         /* all OF versions I've seen use this value */
         if (i2s_node)
-                i2s = ioremap(io->addrs[0].address, 0x1000);
+                i2s = ioremap(awacs_rsrc[0].start, 0x1000);
         else
-                awacs = ioremap(io->addrs[0].address, 0x1000);
-        awacs_txdma = ioremap(io->addrs[1].address, 0x100);
-        awacs_rxdma = ioremap(io->addrs[2].address, 0x100);
+                awacs = ioremap(awacs_rsrc[0].start, 0x1000);
+        awacs_txdma = ioremap(awacs_rsrc[1].start, 0x100);
+        awacs_rxdma = ioremap(awacs_rsrc[2].start, 0x100);
 
         /* first of all make sure that the chip is powered up....*/
         pmac_call_feature(PMAC_FTR_SOUND_CHIP_ENABLE, io, 0, 1);
@@ -3083,9 +3099,10 @@ printk("dmasound_pmac: Awacs/Screamer Codec Mfct: %d Rev %d\n", mfg, rev);
                 struct device_node* mio;
                 macio_base = NULL;
                 for (mio = io->parent; mio; mio = mio->parent) {
-                        if (strcmp(mio->name, "mac-io") == 0
-                            && mio->n_addrs > 0) {
-                                macio_base = ioremap(mio->addrs[0].address, 0x40);
+                        if (strcmp(mio->name, "mac-io") == 0) {
+                                struct resource r;
+                                if (of_address_to_resource(mio, 0, &r) == 0)
+                                        macio_base = ioremap(r.start, 0x40);
                                 break;
                         }
                 }
diff --git a/sound/oss/dmasound/tas_common.c b/sound/oss/dmasound/tas_common.c
index d36a1fe2fc..81315996c0 100644
--- a/sound/oss/dmasound/tas_common.c
+++ b/sound/oss/dmasound/tas_common.c
@@ -47,9 +47,9 @@ static int tas_attach_adapter(struct i2c_adapter *);
 static int tas_detach_client(struct i2c_client *);
 
 struct i2c_driver tas_driver = {
-        .owner          = THIS_MODULE,
-        .name           = "tas",
-        .flags          = I2C_DF_NOTIFY,
+        .driver = {
+                .name   = "tas",
+        },
         .attach_adapter = tas_attach_adapter,
         .detach_client  = tas_detach_client,
 };
diff --git a/sound/oss/emu10k1/main.c b/sound/oss/emu10k1/main.c
index 9b905bae42..23241cbdd9 100644
--- a/sound/oss/emu10k1/main.c
+++ b/sound/oss/emu10k1/main.c
@@ -1428,7 +1428,7 @@ static int __init emu10k1_init_module(void)
 {
         printk(KERN_INFO "Creative EMU10K1 PCI Audio Driver, version " DRIVER_VERSION ", " __TIME__ " " __DATE__ "\n");
 
-        return pci_module_init(&emu10k1_pci_driver);
+        return pci_register_driver(&emu10k1_pci_driver);
 }
 
 static void __exit emu10k1_cleanup_module(void)
diff --git a/sound/oss/es1370.c b/sound/oss/es1370.c
index 8538085086..ae55c53661 100644
--- a/sound/oss/es1370.c
+++ b/sound/oss/es1370.c
@@ -2779,7 +2779,7 @@ static struct pci_driver es1370_driver = {
 static int __init init_es1370(void)
 {
         printk(KERN_INFO "es1370: version v0.38 time " __TIME__ " " __DATE__ "\n");
-        return pci_module_init(&es1370_driver);
+        return pci_register_driver(&es1370_driver);
 }
 
 static void __exit cleanup_es1370(void)
diff --git a/sound/oss/es1371.c b/sound/oss/es1371.c
index 12a56d5ab4..5c697f1625 100644
--- a/sound/oss/es1371.c
+++ b/sound/oss/es1371.c
@@ -3090,7 +3090,7 @@ static struct pci_driver es1371_driver = {
 static int __init init_es1371(void)
 {
         printk(KERN_INFO PFX "version v0.32 time " __TIME__ " " __DATE__ "\n");
-        return pci_module_init(&es1371_driver);
+        return pci_register_driver(&es1371_driver);
 }
 
 static void __exit cleanup_es1371(void)
diff --git a/sound/oss/i810_audio.c b/sound/oss/i810_audio.c
index b9a640fe48..4600cd6742 100644
--- a/sound/oss/i810_audio.c
+++ b/sound/oss/i810_audio.c
@@ -3359,12 +3359,6 @@ static int __devinit i810_probe(struct pci_dev *pci_dev, const struct pci_device
                 goto out_region2;
         }
 
-        if (request_irq(card->irq, &i810_interrupt, SA_SHIRQ,
-                        card_names[pci_id->driver_data], card)) {
-                printk(KERN_ERR "i810_audio: unable to allocate irq %d\n", card->irq);
-                goto out_pio;
-        }
-
         if (card->use_mmio) {
                 if (request_mem_region(card->ac97base_mmio_phys, 512, "ich_audio MMBAR")) {
                         if ((card->ac97base_mmio = ioremap(card->ac97base_mmio_phys, 512))) { /*@FIXME can ioremap fail? don't know (jsaw) */
@@ -3395,10 +3389,8 @@ static int __devinit i810_probe(struct pci_dev *pci_dev, const struct pci_device
         }
 
         /* initialize AC97 codec and register /dev/mixer */
-        if (i810_ac97_init(card) <= 0) {
-                free_irq(card->irq, card);
+        if (i810_ac97_init(card) <= 0)
                 goto out_iospace;
-        }
         pci_set_drvdata(pci_dev, card);
 
         if(clocking == 0) {
@@ -3410,7 +3402,6 @@ static int __devinit i810_probe(struct pci_dev *pci_dev, const struct pci_device
         if ((card->dev_audio = register_sound_dsp(&i810_audio_fops, -1)) < 0) {
                 int i;
                 printk(KERN_ERR "i810_audio: couldn't register DSP device!\n");
-                free_irq(card->irq, card);
                 for (i = 0; i < NR_AC97; i++)
                 if (card->ac97_codec[i] != NULL) {
                         unregister_sound_mixer(card->ac97_codec[i]->dev_mixer);
@@ -3419,6 +3410,13 @@ static int __devinit i810_probe(struct pci_dev *pci_dev, const struct pci_device
                 goto out_iospace;
         }
 
+        if (request_irq(card->irq, &i810_interrupt, SA_SHIRQ,
+                        card_names[pci_id->driver_data], card)) {
+                printk(KERN_ERR "i810_audio: unable to allocate irq %d\n", card->irq);
+                goto out_iospace;
+        }
+
+
         card->initializing = 0;
         return 0;
 
diff --git a/sound/oss/ite8172.c b/sound/oss/ite8172.c
index 26e5944b6b..8fd2f9a9e6 100644
--- a/sound/oss/ite8172.c
+++ b/sound/oss/ite8172.c
@@ -2206,7 +2206,7 @@ static struct pci_driver it8172_driver = {
 static int __init init_it8172(void)
 {
         info("version v0.5 time " __TIME__ " " __DATE__);
-        return pci_module_init(&it8172_driver);
+        return pci_register_driver(&it8172_driver);
 }
 
 static void __exit cleanup_it8172(void)
diff --git a/sound/oss/kahlua.c b/sound/oss/kahlua.c
index 808c5ef969..2835a7c038 100644
--- a/sound/oss/kahlua.c
+++ b/sound/oss/kahlua.c
@@ -218,7 +218,7 @@ static struct pci_driver kahlua_driver = {
 static int __init kahlua_init_module(void)
 {
         printk(KERN_INFO "Cyrix Kahlua VSA1 XpressAudio support (c) Copyright 2003 Red Hat Inc\n");
-        return pci_module_init(&kahlua_driver);
+        return pci_register_driver(&kahlua_driver);
 }
 
 static void __devexit kahlua_cleanup_module(void)
diff --git a/sound/oss/maestro.c b/sound/oss/maestro.c
index 3abd3541cb..d4b569acf7 100644
--- a/sound/oss/maestro.c
+++ b/sound/oss/maestro.c
@@ -230,10 +230,6 @@
 #include <asm/page.h>
 #include <asm/uaccess.h>
 
-#include <linux/pm.h>
-#include <linux/pm_legacy.h>
-static int maestro_pm_callback(struct pm_dev *dev, pm_request_t rqst, void *d);
-
 #include "maestro.h"
 
 static struct pci_driver maestro_pci_driver;
@@ -3404,7 +3400,6 @@ maestro_probe(struct pci_dev *pcidev,const struct pci_device_id *pdid)
         int i, ret;
         struct ess_card *card;
         struct ess_state *ess;
-        struct pm_dev *pmdev;
         int num = 0;
 
 /* when built into the kernel, we only print version if device is found */
@@ -3450,11 +3445,6 @@ maestro_probe(struct pci_dev *pcidev,const struct pci_device_id *pdid)
         memset(card, 0, sizeof(*card));
         card->pcidev = pcidev;
 
-        pmdev = pm_register(PM_PCI_DEV, PM_PCI_ID(pcidev),
-                        maestro_pm_callback);
-        if (pmdev)
-                pmdev->data = card;
-
         card->iobase = iobase;
         card->card_type = card_type;
         card->irq = pcidev->irq;
@@ -3634,7 +3624,7 @@ static int __init init_maestro(void)
 {
         int rc;
 
-        rc = pci_module_init(&maestro_pci_driver);
+        rc = pci_register_driver(&maestro_pci_driver);
         if (rc < 0)
                 return rc;
 
@@ -3670,7 +3660,6 @@ static int maestro_notifier(struct notifier_block *nb, unsigned long event, void
 static void cleanup_maestro(void) {
         M_printk("maestro: unloading\n");
         pci_unregister_driver(&maestro_pci_driver);
-        pm_unregister_all(maestro_pm_callback);
         unregister_reboot_notifier(&maestro_nb);
 }
 
@@ -3691,143 +3680,5 @@ check_suspend(struct ess_card *card)
         current->state = TASK_RUNNING;
 }
 
-static int 
-maestro_suspend(struct ess_card *card)
-{
-        unsigned long flags;
-        int i,j;
-
-        spin_lock_irqsave(&card->lock,flags); /* over-kill */
-
-        M_printk("maestro: apm in dev %p\n",card);
-
-        /* we have to read from the apu regs, need
-                to power it up */
-        maestro_power(card,ACPI_D0);
-
-        for(i=0;i<NR_DSPS;i++) {
-                struct ess_state *s = &card->channels[i];
-
-                if(s->dev_audio == -1)
-                        continue;
-
-                M_printk("maestro: stopping apus for device %d\n",i);
-                stop_dac(s);
-                stop_adc(s);
-                for(j=0;j<6;j++) 
-                        card->apu_map[s->apu[j]][5]=apu_get_register(s,j,5);
-
-        }
-
-        /* get rid of interrupts? */
-        if( card->dsps_open > 0)
-                stop_bob(&card->channels[0]);
-
-        card->in_suspend++;
-
-        spin_unlock_irqrestore(&card->lock,flags);
-
-        /* we trust in the bios to power down the chip on suspend.
-         * XXX I'm also not sure that in_suspend will protect
-         * against all reg accesses from here on out. 
-         */
-        return 0;
-}
-static int 
-maestro_resume(struct ess_card *card)
-{
-        unsigned long flags;
-        int i;
-
-        spin_lock_irqsave(&card->lock,flags); /* over-kill */
-
-        card->in_suspend = 0;
-
-        M_printk("maestro: resuming card at %p\n",card);
-
-        /* restore all our config */
-        maestro_config(card);
-        /* need to restore the base pointers.. */ 
-        if(card->dmapages) 
-                set_base_registers(&card->channels[0],card->dmapages);
-
-        mixer_push_state(card);
-
-        /* set each channels' apu control registers before
-         * restoring audio 
-         */
-        for(i=0;i<NR_DSPS;i++) {
-                struct ess_state *s = &card->channels[i];
-                int chan,reg;
-
-                if(s->dev_audio == -1)
-                        continue;
-
-                for(chan = 0 ; chan < 6 ; chan++) {
-                        wave_set_register(s,s->apu[chan]<<3,s->apu_base[chan]);
-                        for(reg = 1 ; reg < NR_APU_REGS ; reg++)  
-                                apu_set_register(s,chan,reg,s->card->apu_map[s->apu[chan]][reg]);
-                }
-                for(chan = 0 ; chan < 6 ; chan++)  
-                        apu_set_register(s,chan,0,s->card->apu_map[s->apu[chan]][0] & 0xFF0F);
-        }
-
-        /* now we flip on the music */
-
-        if( card->dsps_open <= 0) {
-                /* this card's idle */
-                maestro_power(card,ACPI_D2);
-        } else {
-                /* ok, we're actually playing things on
-                        this card */
-                maestro_power(card,ACPI_D0);
-                start_bob(&card->channels[0]);
-                for(i=0;i<NR_DSPS;i++) {
-                        struct ess_state *s = &card->channels[i];
-
-                        /* these use the apu_mode, and can handle
-                                spurious calls */
-                        start_dac(s);   
-                        start_adc(s);   
-                }
-        }
-
-        spin_unlock_irqrestore(&card->lock,flags);
-
-        /* all right, we think things are ready, 
-                wake up people who were using the device
-                when we suspended */
-        wake_up(&(card->suspend_queue));
-
-        return 0;
-}
-
-int 
-maestro_pm_callback(struct pm_dev *dev, pm_request_t rqst, void *data) 
-{
-        struct ess_card *card = (struct ess_card*) dev->data;
-
-        if ( ! card ) goto out;
-
-        M_printk("maestro: pm event 0x%x received for card %p\n", rqst, card);
-        
-        switch (rqst) {
-                case PM_SUSPEND: 
-                        maestro_suspend(card);
-                break;
-                case PM_RESUME: 
-                        maestro_resume(card);
-                break;
-                /*
-                 * we'd also like to find out about
-                 * power level changes because some biosen
-                 * do mean things to the maestro when they
-                 * change their power state.
-                 */
-        }
-out:
-        return 0;
-}
-
 module_init(init_maestro);
 module_exit(cleanup_maestro);
diff --git a/sound/oss/nec_vrc5477.c b/sound/oss/nec_vrc5477.c
index 9ac4bf7e1e..fbb9170e8e 100644
--- a/sound/oss/nec_vrc5477.c
+++ b/sound/oss/nec_vrc5477.c
@@ -2045,7 +2045,7 @@ static struct pci_driver vrc5477_ac97_driver = {
 static int __init init_vrc5477_ac97(void)
 {
         printk("Vrc5477 AC97 driver: version v0.2 time " __TIME__ " " __DATE__ " by Jun Sun\n");
-        return pci_module_init(&vrc5477_ac97_driver);
+        return pci_register_driver(&vrc5477_ac97_driver);
 }
 
 static void __exit cleanup_vrc5477_ac97(void)
diff --git a/sound/oss/nm256_audio.c b/sound/oss/nm256_audio.c
index 0ce2c404a7..7de079b202 100644
--- a/sound/oss/nm256_audio.c
+++ b/sound/oss/nm256_audio.c
@@ -24,8 +24,6 @@
 #include <linux/interrupt.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/pm.h>
-#include <linux/pm_legacy.h>
 #include <linux/delay.h>
 #include <linux/spinlock.h>
 #include "sound_config.h"
@@ -49,7 +47,6 @@ static int nm256_grabInterrupt (struct nm256_info *card);
 static int nm256_releaseInterrupt (struct nm256_info *card);
 static irqreturn_t nm256_interrupt (int irq, void *dev_id, struct pt_regs *dummy);
 static irqreturn_t nm256_interrupt_zx (int irq, void *dev_id, struct pt_regs *dummy);
-static int handle_pm_event (struct pm_dev *dev, pm_request_t rqst, void *data);
 
 /* These belong in linux/pci.h. */
 #define PCI_DEVICE_ID_NEOMAGIC_NM256AV_AUDIO 0x8005
@@ -992,15 +989,6 @@ nm256_install_mixer (struct nm256_info *card)
     return 0;
 }
 
-/* Perform a full reset on the hardware; this is invoked when an APM
-   resume event occurs.  */
-static void
-nm256_full_reset (struct nm256_info *card)
-{
-    nm256_initHw (card);
-    ac97_reset (&(card->mdev));
-}
-
 /* 
  * See if the signature left by the NM256 BIOS is intact; if so, we use
  * the associated address as the end of our audio buffer in the video
@@ -1053,7 +1041,6 @@ static int __devinit
 nm256_install(struct pci_dev *pcidev, enum nm256rev rev, char *verstr)
 {
     struct nm256_info *card;
-    struct pm_dev *pmdev;
     int x;
 
     if (pci_enable_device(pcidev))
@@ -1234,43 +1221,10 @@ nm256_install(struct pci_dev *pcidev, enum nm256rev rev, char *verstr)
 
     nm256_install_mixer (card);
 
-    pmdev = pm_register(PM_PCI_DEV, PM_PCI_ID(pcidev), handle_pm_event);
-    if (pmdev)
-        pmdev->data = card;
-
     return 1;
 }
 
 
-/*
- * PM event handler, so the card is properly reinitialized after a power
- * event.
- */
-static int
-handle_pm_event (struct pm_dev *dev, pm_request_t rqst, void *data)
-{
-    struct nm256_info *crd = (struct nm256_info*) dev->data;
-    if (crd) {
-        switch (rqst) {
-        case PM_SUSPEND:
-            break;
-        case PM_RESUME:
-            {
-                int playing = crd->playing;
-                nm256_full_reset (crd);
-                /*
-                 * A little ugly, but that's ok; pretend the
-                 * block we were playing is done. 
-                 */
-                if (playing)
-                    DMAbuf_outputintr (crd->dev_for_play, 1);
-            }
-            break;
-        }
-    }
-    return 0;
-}
-
 static int __devinit
 nm256_probe(struct pci_dev *pcidev,const struct pci_device_id *pciid)
 {
@@ -1690,13 +1644,12 @@ module_param(force_load, bool, 0);
 static int __init do_init_nm256(void)
 {
     printk (KERN_INFO "NeoMagic 256AV/256ZX audio driver, version 1.1p\n");
-    return pci_module_init(&nm256_pci_driver);
+    return pci_register_driver(&nm256_pci_driver);
 }
 
 static void __exit cleanup_nm256 (void)
 {
     pci_unregister_driver(&nm256_pci_driver);
-    pm_unregister_all (&handle_pm_event);
 }
 
 module_init(do_init_nm256);
diff --git a/sound/oss/opl3sa2.c b/sound/oss/opl3sa2.c
index cd41d0e470..5cecdbcbea 100644
--- a/sound/oss/opl3sa2.c
+++ b/sound/oss/opl3sa2.c
@@ -69,8 +69,6 @@
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/delay.h>
-#include <linux/pm.h>
-#include <linux/pm_legacy.h>
 #include "sound_config.h"
 
 #include "ad1848.h"
@@ -139,10 +137,6 @@ typedef struct {
         struct pnp_dev* pdev;
         int activated;                  /* Whether said devices have been activated */
 #endif
-#ifdef CONFIG_PM_LEGACY
-        unsigned int    in_suspend;
-        struct pm_dev   *pmdev;
-#endif
         unsigned int    card;
         int             chipset;        /* What's my version(s)? */
         char            *chipset_name;
@@ -341,22 +335,6 @@ static void opl3sa2_mixer_reset(opl3sa2_state_t* devc)
         }
 }
 
-/* Currently only used for power management */
-#ifdef CONFIG_PM_LEGACY
-static void opl3sa2_mixer_restore(opl3sa2_state_t* devc)
-{
-        if (devc) {
-                opl3sa2_set_volume(devc, devc->volume_l, devc->volume_r);
-                opl3sa2_set_mic(devc, devc->mic);
-
-                if (devc->chipset == CHIPSET_OPL3SA3) {
-                        opl3sa3_set_bass(devc, devc->bass_l, devc->bass_r);
-                        opl3sa3_set_treble(devc, devc->treble_l, devc->treble_r);
-                }
-        }
-}
-#endif /* CONFIG_PM_LEGACY */
-
 static inline void arg_to_vol_mono(unsigned int vol, int* value)
 {
         int left;
@@ -832,84 +810,6 @@ static struct pnp_driver opl3sa2_driver = {
 
 /* End of component functions */
 
-#ifdef CONFIG_PM_LEGACY
-
-static DEFINE_SPINLOCK(opl3sa2_lock);
-
-/* Power Management support functions */
-static int opl3sa2_suspend(struct pm_dev *pdev, unsigned int pm_mode)
-{
-        unsigned long flags;
-        opl3sa2_state_t *p;
-
-        if (!pdev)
-                return -EINVAL;
-
-        spin_lock_irqsave(&opl3sa2_lock,flags);
-
-        p = (opl3sa2_state_t *) pdev->data;
-        switch (pm_mode) {
-        case 1:
-                pm_mode = OPL3SA2_PM_MODE1;
-                break;
-        case 2:
-                pm_mode = OPL3SA2_PM_MODE2;
-                break;
-        case 3:
-                pm_mode = OPL3SA2_PM_MODE3;
-                break;
-        default:
-                /* we don't know howto handle this... */
-                spin_unlock_irqrestore(&opl3sa2_lock, flags);
-                return -EBUSY;
-        }
-
-        p->in_suspend = 1;
-
-        /* its supposed to automute before suspending, so we won't bother */
-        opl3sa2_write(p->cfg_port, OPL3SA2_PM, pm_mode);
-        /* wait a while for the clock oscillator to stabilise */
-        mdelay(10);
-
-        spin_unlock_irqrestore(&opl3sa2_lock,flags);
-        return 0;
-}
-
-static int opl3sa2_resume(struct pm_dev *pdev)
-{
-        unsigned long flags;
-        opl3sa2_state_t *p;
-
-        if (!pdev)
-                return -EINVAL;
-
-        p = (opl3sa2_state_t *) pdev->data;
-        spin_lock_irqsave(&opl3sa2_lock,flags);
-
-        /* I don't think this is necessary */
-        opl3sa2_write(p->cfg_port, OPL3SA2_PM, OPL3SA2_PM_MODE0);
-        opl3sa2_mixer_restore(p);
-        p->in_suspend = 0;
-
-        spin_unlock_irqrestore(&opl3sa2_lock,flags);
-        return 0;
-}
-
-static int opl3sa2_pm_callback(struct pm_dev *pdev, pm_request_t rqst, void *data)
-{
-        unsigned long mode = (unsigned  long)data;
-
-        switch (rqst) {
-                case PM_SUSPEND:
-                        return opl3sa2_suspend(pdev, mode);
-
-                case PM_RESUME:
-                        return opl3sa2_resume(pdev);
-        }
-        return 0;
-}
-#endif /* CONFIG_PM_LEGACY */
-
 /*
  * Install OPL3-SA2 based card(s).
  *
@@ -1021,12 +921,6 @@ static int __init init_opl3sa2(void)
 
                 /* ewww =) */
                 opl3sa2_state[card].card = card;
-#ifdef CONFIG_PM_LEGACY
-                /* register our power management capabilities */
-                opl3sa2_state[card].pmdev = pm_register(PM_ISA_DEV, card, opl3sa2_pm_callback);
-                if (opl3sa2_state[card].pmdev)
-                        opl3sa2_state[card].pmdev->data = &opl3sa2_state[card];
-#endif /* CONFIG_PM_LEGACY */
 
                 /*
                  * Set the Yamaha 3D enhancement mode (aka Ymersion) if asked to and
@@ -1083,10 +977,6 @@ static void __exit cleanup_opl3sa2(void)
         int card;
 
         for(card = 0; card < opl3sa2_cards_num; card++) {
-#ifdef CONFIG_PM_LEGACY
-                if (opl3sa2_state[card].pmdev)
-                        pm_unregister(opl3sa2_state[card].pmdev);
-#endif
                 if (opl3sa2_state[card].cfg_mpu.slots[1] != -1) {
                         unload_opl3sa2_mpu(&opl3sa2_state[card].cfg_mpu);
                 }
diff --git a/sound/oss/rme96xx.c b/sound/oss/rme96xx.c
index 318dc51009..faa0b7919b 100644
--- a/sound/oss/rme96xx.c
+++ b/sound/oss/rme96xx.c
@@ -1095,7 +1095,7 @@ static int __init init_rme96xx(void)
         devices = ((devices-1) & RME96xx_MASK_DEVS) + 1;
         printk(KERN_INFO RME_MESS" reserving %d dsp device(s)\n",devices);
         numcards = 0;
-        return pci_module_init(&rme96xx_driver);
+        return pci_register_driver(&rme96xx_driver);
 }
 
 static void __exit cleanup_rme96xx(void)
diff --git a/sound/oss/sonicvibes.c b/sound/oss/sonicvibes.c
index 17d0e461f8..71b05e2f69 100644
--- a/sound/oss/sonicvibes.c
+++ b/sound/oss/sonicvibes.c
@@ -2765,7 +2765,7 @@ static int __init init_sonicvibes(void)
         if (!(wavetable_mem = __get_free_pages(GFP_KERNEL, 20-PAGE_SHIFT)))
                 printk(KERN_INFO "sv: cannot allocate 1MB of contiguous nonpageable memory for wavetable data\n");
 #endif
-        return pci_module_init(&sv_driver);
+        return pci_register_driver(&sv_driver);
 }
 
 static void __exit cleanup_sonicvibes(void)
diff --git a/sound/oss/ymfpci.c b/sound/oss/ymfpci.c
index 8dae59bd05..f8bd72e46f 100644
--- a/sound/oss/ymfpci.c
+++ b/sound/oss/ymfpci.c
@@ -2680,7 +2680,7 @@ static struct pci_driver ymfpci_driver = {
 
 static int __init ymf_init_module(void)
 {
-        return pci_module_init(&ymfpci_driver);
+        return pci_register_driver(&ymfpci_driver);
 }
 
 static void __exit ymf_cleanup_module (void)
diff --git a/sound/pci/cs5535audio/cs5535audio.c b/sound/pci/cs5535audio/cs5535audio.c
index 202c7cf3e3..f36ede8274 100644
--- a/sound/pci/cs5535audio/cs5535audio.c
+++ b/sound/pci/cs5535audio/cs5535audio.c
@@ -385,7 +385,7 @@ static struct pci_driver driver = {
 
 static int __init alsa_card_cs5535audio_init(void)
 {
-        return pci_module_init(&driver);
+        return pci_register_driver(&driver);
 }
 
 static void __exit alsa_card_cs5535audio_exit(void)
diff --git a/sound/pcmcia/pdaudiocf/pdaudiocf_pcm.c b/sound/pcmcia/pdaudiocf/pdaudiocf_pcm.c
index 09cb250d58..962e6d5255 100644
--- a/sound/pcmcia/pdaudiocf/pdaudiocf_pcm.c
+++ b/sound/pcmcia/pdaudiocf/pdaudiocf_pcm.c
@@ -209,7 +209,7 @@ static int pdacf_pcm_prepare(struct snd_pcm_substream *subs)
         case SNDRV_PCM_FORMAT_S24_3LE:
         case SNDRV_PCM_FORMAT_S24_3BE:
                 chip->pcm_sample = 3;
-                /* fall trough */
+                /* fall through */
         default: /* 24-bit */
                 aval = AK4117_DIF_24R;
                 chip->pcm_frame = 3;
diff --git a/sound/ppc/keywest.c b/sound/ppc/keywest.c
index 097fbcfc5d..6058c2dd1b 100644
--- a/sound/ppc/keywest.c
+++ b/sound/ppc/keywest.c
@@ -41,9 +41,10 @@ static int keywest_attach_adapter(struct i2c_adapter *adapter);
 static int keywest_detach_client(struct i2c_client *client);
 
 struct i2c_driver keywest_driver = {  
-        .name = "PMac Keywest Audio",
+        .driver = {
+                .name = "PMac Keywest Audio",
+        },
         .id = I2C_DRIVERID_KEYWEST,
-        .flags = I2C_DF_NOTIFY,
         .attach_adapter = &keywest_attach_adapter,
         .detach_client = &keywest_detach_client,
 };
diff --git a/sound/ppc/pmac.c b/sound/ppc/pmac.c
index 9b2b00fdc1..a642e4cfcf 100644
--- a/sound/ppc/pmac.c
+++ b/sound/ppc/pmac.c
@@ -803,21 +803,17 @@ static int snd_pmac_free(struct snd_pmac *chip)
                 iounmap(chip->playback.dma);
         if (chip->capture.dma)
                 iounmap(chip->capture.dma);
-#ifndef CONFIG_PPC64
+
         if (chip->node) {
                 int i;
-
                 for (i = 0; i < 3; i++) {
-                        if (chip->of_requested & (1 << i)) {
-                                if (chip->is_k2)
-                                        release_OF_resource(chip->node->parent,
-                                                            i);
-                                else
-                                        release_OF_resource(chip->node, i);
-                        }
+                        if (chip->requested & (1 << i))
+                                release_mem_region(chip->rsrc[i].start,
+                                                   chip->rsrc[i].end -
+                                                   chip->rsrc[i].start + 1);
                 }
         }
-#endif /* CONFIG_PPC64 */
+
         if (chip->pdev)
                 pci_dev_put(chip->pdev);
         kfree(chip);
@@ -991,6 +987,11 @@ static int __init snd_pmac_detect(struct snd_pmac *chip)
                         chip->can_byte_swap = 0; /* FIXME: check this */
                         chip->control_mask = MASK_IEPC | 0x11;/* disable IEE */
                         break;
+                default:
+                        printk(KERN_ERR "snd: Unknown layout ID 0x%x\n",
+                               layout_id);
+                        return -ENODEV;
+
                 }
         }
         prop = (unsigned int *)get_property(sound, "device-id", NULL);
@@ -1175,46 +1176,69 @@ int __init snd_pmac_new(struct snd_card *card, struct snd_pmac **chip_return)
         }
 
         np = chip->node;
+        chip->requested = 0;
         if (chip->is_k2) {
-                if (np->parent->n_addrs < 2 || np->n_intrs < 3) {
+                static char *rnames[] = {
+                        "Sound Control", "Sound DMA" };
+                if (np->n_intrs < 3) {
                         err = -ENODEV;
                         goto __error;
                 }
-                for (i = 0; i < 2; i++) {
-#ifndef CONFIG_PPC64
-                        static char *name[2] = { "- Control", "- DMA" };
-                        if (! request_OF_resource(np->parent, i, name[i])) {
-                                snd_printk(KERN_ERR "pmac: can't request resource %d!\n", i);
+                for (i = 0; i < 2; i ++) {
+                        if (of_address_to_resource(np->parent, i,
+                                                   &chip->rsrc[i])) {
+                                printk(KERN_ERR "snd: can't translate rsrc "
+                                       " %d (%s)\n", i, rnames[i]);
+                                err = -ENODEV;
+                                goto __error;
+                        }
+                        if (request_mem_region(chip->rsrc[i].start,
+                                               chip->rsrc[i].end -
+                                               chip->rsrc[i].start + 1,
+                                               rnames[i]) == NULL) {
+                                printk(KERN_ERR "snd: can't request rsrc "
+                                       " %d (%s: 0x%08lx:%08lx)\n",
+                                       i, rnames[i], chip->rsrc[i].start,
+                                       chip->rsrc[i].end);
                                 err = -ENODEV;
                                 goto __error;
                         }
-                        chip->of_requested |= (1 << i);
-#endif /* CONFIG_PPC64 */
-                        ctrl_addr = np->parent->addrs[0].address;
-                        txdma_addr = np->parent->addrs[1].address;
-                        rxdma_addr = txdma_addr + 0x100;
+                        chip->requested |= (1 << i);
                 }
-
+                ctrl_addr = chip->rsrc[0].start;
+                txdma_addr = chip->rsrc[1].start;
+                rxdma_addr = txdma_addr + 0x100;
         } else {
-                if (np->n_addrs < 3 || np->n_intrs < 3) {
+                static char *rnames[] = {
+                        "Sound Control", "Sound Tx DMA", "Sound Rx DMA" };
+                if (np->n_intrs < 3) {
                         err = -ENODEV;
                         goto __error;
                 }
-
-                for (i = 0; i < 3; i++) {
-#ifndef CONFIG_PPC64
-                        static char *name[3] = { "- Control", "- Tx DMA", "- Rx DMA" };
-                        if (! request_OF_resource(np, i, name[i])) {
-                                snd_printk(KERN_ERR "pmac: can't request resource %d!\n", i);
+                for (i = 0; i < 3; i ++) {
+                        if (of_address_to_resource(np->parent, i,
+                                                   &chip->rsrc[i])) {
+                                printk(KERN_ERR "snd: can't translate rsrc "
+                                       " %d (%s)\n", i, rnames[i]);
+                                err = -ENODEV;
+                                goto __error;
+                        }
+                        if (request_mem_region(chip->rsrc[i].start,
+                                               chip->rsrc[i].end -
+                                               chip->rsrc[i].start + 1,
+                                               rnames[i]) == NULL) {
+                                printk(KERN_ERR "snd: can't request rsrc "
+                                       " %d (%s: 0x%08lx:%08lx)\n",
+                                       i, rnames[i], chip->rsrc[i].start,
+                                       chip->rsrc[i].end);
                                 err = -ENODEV;
                                 goto __error;
                         }
-                        chip->of_requested |= (1 << i);
-#endif /* CONFIG_PPC64 */
-                        ctrl_addr = np->addrs[0].address;
-                        txdma_addr = np->addrs[1].address;
-                        rxdma_addr = np->addrs[2].address;
+                        chip->requested |= (1 << i);
                 }
+                ctrl_addr = chip->rsrc[0].start;
+                txdma_addr = chip->rsrc[1].start;
+                rxdma_addr = chip->rsrc[2].start;
         }
 
         chip->awacs = ioremap(ctrl_addr, 0x1000);
@@ -1266,9 +1290,11 @@ int __init snd_pmac_new(struct snd_card *card, struct snd_pmac **chip_return)
         } else if (chip->is_pbook_G3) {
                 struct device_node* mio;
                 for (mio = chip->node->parent; mio; mio = mio->parent) {
-                        if (strcmp(mio->name, "mac-io") == 0
-                            && mio->n_addrs > 0) {
-                                chip->macio_base = ioremap(mio->addrs[0].address, 0x40);
+                        if (strcmp(mio->name, "mac-io") == 0) {
+                                struct resource r;
+                                if (of_address_to_resource(mio, 0, &r) == 0)
+                                        chip->macio_base =
+                                                ioremap(r.start, 0x40);
                                 break;
                         }
                 }
diff --git a/sound/ppc/pmac.h b/sound/ppc/pmac.h
index 086da7a189..3a9bd4dbb9 100644
--- a/sound/ppc/pmac.h
+++ b/sound/ppc/pmac.h
@@ -113,7 +113,8 @@ struct snd_pmac {
         unsigned int initialized : 1;
         unsigned int feature_is_set : 1;
 
-        unsigned int of_requested;
+        unsigned int requested;
+        struct resource rsrc[3];
 
         int num_freqs;
         int *freq_table;