3 files changed, 159 insertions, 253 deletions

diff --git a/sound/sparc/amd7930.c b/sound/sparc/amd7930.c
index 0c63e0585b15..f87933e48812 100644
--- a/sound/sparc/amd7930.c
+++ b/sound/sparc/amd7930.c
@@ -1,6 +1,6 @@
 /*
  * Driver for AMD7930 sound chips found on Sparcs.
- * Copyright (C) 2002 David S. Miller <davem@redhat.com>
+ * Copyright (C) 2002, 2008 David S. Miller <davem@davemloft.net>
  *
  * Based entirely upon drivers/sbus/audio/amd7930.c which is:
  * Copyright (C) 1996,1997 Thomas K. Dyas (tdyas@eden.rutgers.edu)
@@ -35,6 +35,8 @@
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/moduleparam.h>
+#include <linux/of.h>
+#include <linux/of_device.h>
 
 #include <sound/core.h>
 #include <sound/pcm.h>
@@ -44,7 +46,6 @@
 
 #include <asm/io.h>
 #include <asm/irq.h>
-#include <asm/sbus.h>
 #include <asm/prom.h>
 
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;      /* Index 0-MAX */
@@ -335,8 +336,8 @@ struct snd_amd7930 {
         int                     pgain;
         int                     mgain;
 
+        struct of_device        *op;
         unsigned int            irq;
-        unsigned int            regs_size;
         struct snd_amd7930      *next;
 };
 
@@ -765,7 +766,6 @@ static int __devinit snd_amd7930_pcm(struct snd_amd7930 *amd)
                                /* playback count */ 1,
                                /* capture count */  1, &pcm)) < 0)
                 return err;
-        snd_assert(pcm != NULL, return -EINVAL);
 
         snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_amd7930_playback_ops);
         snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_amd7930_capture_ops);
@@ -788,13 +788,6 @@ static int __devinit snd_amd7930_pcm(struct snd_amd7930 *amd)
 
 static int snd_amd7930_info_volume(struct snd_kcontrol *kctl, struct snd_ctl_elem_info *uinfo)
 {
-        int type = kctl->private_value;
-
-        snd_assert(type == VOLUME_MONITOR ||
-                   type == VOLUME_CAPTURE ||
-                   type == VOLUME_PLAYBACK, return -EINVAL);
-        (void) type;
-
         uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
         uinfo->count = 1;
         uinfo->value.integer.min = 0;
@@ -809,10 +802,6 @@ static int snd_amd7930_get_volume(struct snd_kcontrol *kctl, struct snd_ctl_elem
         int type = kctl->private_value;
         int *swval;
 
-        snd_assert(type == VOLUME_MONITOR ||
-                   type == VOLUME_CAPTURE ||
-                   type == VOLUME_PLAYBACK, return -EINVAL);
-
         switch (type) {
         case VOLUME_MONITOR:
                 swval = &amd->mgain;
@@ -838,10 +827,6 @@ static int snd_amd7930_put_volume(struct snd_kcontrol *kctl, struct snd_ctl_elem
         int type = kctl->private_value;
         int *swval, change;
 
-        snd_assert(type == VOLUME_MONITOR ||
-                   type == VOLUME_CAPTURE ||
-                   type == VOLUME_PLAYBACK, return -EINVAL);
-
         switch (type) {
         case VOLUME_MONITOR:
                 swval = &amd->mgain;
@@ -904,7 +889,8 @@ static int __devinit snd_amd7930_mixer(struct snd_amd7930 *amd)
         struct snd_card *card;
         int idx, err;
 
-        snd_assert(amd != NULL && amd->card != NULL, return -EINVAL);
+        if (snd_BUG_ON(!amd || !amd->card))
+                return -EINVAL;
 
         card = amd->card;
         strcpy(card->mixername, card->shortname);
@@ -920,13 +906,16 @@ static int __devinit snd_amd7930_mixer(struct snd_amd7930 *amd)
 
 static int snd_amd7930_free(struct snd_amd7930 *amd)
 {
+        struct of_device *op = amd->op;
+
         amd7930_idle(amd);
 
         if (amd->irq)
                 free_irq(amd->irq, amd);
 
         if (amd->regs)
-                sbus_iounmap(amd->regs, amd->regs_size);
+                of_iounmap(&op->resource[0], amd->regs,
+                           resource_size(&op->resource[0]));
 
         kfree(amd);
 
@@ -945,13 +934,12 @@ static struct snd_device_ops snd_amd7930_dev_ops = {
 };
 
 static int __devinit snd_amd7930_create(struct snd_card *card,
-                                        struct resource *rp,
-                                        unsigned int reg_size,
+                                        struct of_device *op,
                                         int irq, int dev,
                                         struct snd_amd7930 **ramd)
 {
-        unsigned long flags;
         struct snd_amd7930 *amd;
+        unsigned long flags;
         int err;
 
         *ramd = NULL;
@@ -961,9 +949,10 @@ static int __devinit snd_amd7930_create(struct snd_card *card,
 
         spin_lock_init(&amd->lock);
         amd->card = card;
-        amd->regs_size = reg_size;
+        amd->op = op;
 
-        amd->regs = sbus_ioremap(rp, 0, amd->regs_size, "amd7930");
+        amd->regs = of_ioremap(&op->resource[0], 0,
+                               resource_size(&op->resource[0]), "amd7930");
         if (!amd->regs) {
                 snd_printk("amd7930-%d: Unable to map chip registers.\n", dev);
                 return -EIO;
@@ -1012,12 +1001,15 @@ static int __devinit snd_amd7930_create(struct snd_card *card,
         return 0;
 }
 
-static int __devinit amd7930_attach_common(struct resource *rp, int irq)
+static int __devinit amd7930_sbus_probe(struct of_device *op, const struct of_device_id *match)
 {
+        struct resource *rp = &op->resource[0];
         static int dev_num;
         struct snd_card *card;
         struct snd_amd7930 *amd;
-        int err;
+        int err, irq;
+
+        irq = op->irqs[0];
 
         if (dev_num >= SNDRV_CARDS)
                 return -ENODEV;
@@ -1038,8 +1030,7 @@ static int __devinit amd7930_attach_common(struct resource *rp, int irq)
                 (unsigned long long)rp->start,
                 irq);
 
-        if ((err = snd_amd7930_create(card, rp,
-                                      (rp->end - rp->start) + 1,
+        if ((err = snd_amd7930_create(card, op,
                                       irq, dev_num, &amd)) < 0)
                 goto out_err;
 
@@ -1064,43 +1055,7 @@ out_err:
         return err;
 }
 
-static int __devinit amd7930_obio_attach(struct device_node *dp)
-{
-        const struct linux_prom_registers *regs;
-        const struct linux_prom_irqs *irqp;
-        struct resource res, *rp;
-        int len;
-
-        irqp = of_get_property(dp, "intr", &len);
-        if (!irqp) {
-                snd_printk("%s: Firmware node lacks IRQ property.\n",
-                           dp->full_name);
-                return -ENODEV;
-        }
-
-        regs = of_get_property(dp, "reg", &len);
-        if (!regs) {
-                snd_printk("%s: Firmware node lacks register property.\n",
-                           dp->full_name);
-                return -ENODEV;
-        }
-
-        rp = &res;
-        rp->start = regs->phys_addr;
-        rp->end = rp->start + regs->reg_size - 1;
-        rp->flags = IORESOURCE_IO | (regs->which_io & 0xff);
-
-        return amd7930_attach_common(rp, irqp->pri);
-}
-
-static int __devinit amd7930_sbus_probe(struct of_device *dev, const struct of_device_id *match)
-{
-        struct sbus_dev *sdev = to_sbus_device(&dev->dev);
-
-        return amd7930_attach_common(&sdev->resource[0], sdev->irqs[0]);
-}
-
-static struct of_device_id amd7930_match[] = {
+static const struct of_device_id amd7930_match[] = {
         {
                 .name = "audio",
         },
@@ -1115,20 +1070,7 @@ static struct of_platform_driver amd7930_sbus_driver = {
 
 static int __init amd7930_init(void)
 {
-        struct device_node *dp;
-
-        /* Try to find the sun4c "audio" node first. */
-        dp = of_find_node_by_path("/");
-        dp = dp->child;
-        while (dp) {
-                if (!strcmp(dp->name, "audio"))
-                        amd7930_obio_attach(dp);
-
-                dp = dp->sibling;
-        }
-
-        /* Probe each SBUS for amd7930 chips. */
-        return of_register_driver(&amd7930_sbus_driver, &sbus_bus_type);
+        return of_register_driver(&amd7930_sbus_driver, &of_bus_type);
 }
 
 static void __exit amd7930_exit(void)
diff --git a/sound/sparc/cs4231.c b/sound/sparc/cs4231.c
index 1c4797be72ee..d44bf98e965e 100644
--- a/sound/sparc/cs4231.c
+++ b/sound/sparc/cs4231.c
@@ -1,6 +1,6 @@
 /*
  * Driver for CS4231 sound chips found on Sparcs.
- * Copyright (C) 2002 David S. Miller <davem@redhat.com>
+ * Copyright (C) 2002, 2008 David S. Miller <davem@davemloft.net>
  *
  * Based entirely upon drivers/sbus/audio/cs4231.c which is:
  * Copyright (C) 1996, 1997, 1998 Derrick J Brashear (shadow@andrew.cmu.edu)
@@ -17,7 +17,8 @@
 #include <linux/moduleparam.h>
 #include <linux/irq.h>
 #include <linux/io.h>
-
+#include <linux/of.h>
+#include <linux/of_device.h>
 
 #include <sound/core.h>
 #include <sound/pcm.h>
@@ -29,13 +30,12 @@
 
 #ifdef CONFIG_SBUS
 #define SBUS_SUPPORT
-#include <asm/sbus.h>
 #endif
 
 #if defined(CONFIG_PCI) && defined(CONFIG_SPARC64)
 #define EBUS_SUPPORT
 #include <linux/pci.h>
-#include <asm/ebus.h>
+#include <asm/ebus_dma.h>
 #endif
 
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;      /* Index 0-MAX */
@@ -70,8 +70,6 @@ struct cs4231_dma_control {
         int             (*request)(struct cs4231_dma_control *dma_cont,
                                    dma_addr_t bus_addr, size_t len);
         unsigned int    (*address)(struct cs4231_dma_control *dma_cont);
-        void            (*preallocate)(struct snd_cs4231 *chip,
-                                       struct snd_pcm *pcm);
 #ifdef EBUS_SUPPORT
         struct          ebus_dma_info   ebus_info;
 #endif
@@ -114,21 +112,12 @@ struct snd_cs4231 {
         struct mutex            mce_mutex;      /* mutex for mce register */
         struct mutex            open_mutex;     /* mutex for ALSA open/close */
 
-        union {
-#ifdef SBUS_SUPPORT
-                struct sbus_dev         *sdev;
-#endif
-#ifdef EBUS_SUPPORT
-                struct pci_dev          *pdev;
-#endif
-        } dev_u;
+        struct of_device        *op;
         unsigned int            irq[2];
         unsigned int            regs_size;
         struct snd_cs4231       *next;
 };
 
-static struct snd_cs4231 *cs4231_list;
-
 /* Eventually we can use sound/isa/cs423x/cs4231_lib.c directly, but for
  * now....  -DaveM
  */
@@ -267,27 +256,19 @@ static unsigned char snd_cs4231_original_image[32] =
 
 static u8 __cs4231_readb(struct snd_cs4231 *cp, void __iomem *reg_addr)
 {
-#ifdef EBUS_SUPPORT
         if (cp->flags & CS4231_FLAG_EBUS)
                 return readb(reg_addr);
         else
-#endif
-#ifdef SBUS_SUPPORT
                 return sbus_readb(reg_addr);
-#endif
 }
 
 static void __cs4231_writeb(struct snd_cs4231 *cp, u8 val,
                             void __iomem *reg_addr)
 {
-#ifdef EBUS_SUPPORT
         if (cp->flags & CS4231_FLAG_EBUS)
                 return writeb(val, reg_addr);
         else
-#endif
-#ifdef SBUS_SUPPORT
                 return sbus_writeb(val, reg_addr);
-#endif
 }
 
 /*
@@ -1258,7 +1239,9 @@ static int __init snd_cs4231_pcm(struct snd_card *card)
         pcm->info_flags = SNDRV_PCM_INFO_JOINT_DUPLEX;
         strcpy(pcm->name, "CS4231");
 
-        chip->p_dma.preallocate(chip, pcm);
+        snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,
+                                              &chip->op->dev,
+                                              64 * 1024, 128 * 1024);
 
         chip->pcm = pcm;
 
@@ -1560,7 +1543,8 @@ static int __init snd_cs4231_mixer(struct snd_card *card)
         struct snd_cs4231 *chip = card->private_data;
         int err, idx;
 
-        snd_assert(chip != NULL && chip->pcm != NULL, return -EINVAL);
+        if (snd_BUG_ON(!chip || !chip->pcm))
+                return -EINVAL;
 
         strcpy(card->mixername, chip->pcm->name);
 
@@ -1626,8 +1610,7 @@ static int __init cs4231_attach_finish(struct snd_card *card)
         if (err < 0)
                 goto out_err;
 
-        chip->next = cs4231_list;
-        cs4231_list = chip;
+        dev_set_drvdata(&chip->op->dev, chip);
 
         dev++;
         return 0;
@@ -1782,24 +1765,19 @@ static unsigned int sbus_dma_addr(struct cs4231_dma_control *dma_cont)
         return sbus_readl(base->regs + base->dir + APCVA);
 }
 
-static void sbus_dma_preallocate(struct snd_cs4231 *chip, struct snd_pcm *pcm)
-{
-        snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_SBUS,
-                                        snd_dma_sbus_data(chip->dev_u.sdev),
-                                        64 * 1024, 128 * 1024);
-}
-
 /*
  * Init and exit routines
  */
 
 static int snd_cs4231_sbus_free(struct snd_cs4231 *chip)
 {
+        struct of_device *op = chip->op;
+
         if (chip->irq[0])
                 free_irq(chip->irq[0], chip);
 
         if (chip->port)
-                sbus_iounmap(chip->port, chip->regs_size);
+                of_iounmap(&op->resource[0], chip->port, chip->regs_size);
 
         return 0;
 }
@@ -1816,7 +1794,7 @@ static struct snd_device_ops snd_cs4231_sbus_dev_ops = {
 };
 
 static int __init snd_cs4231_sbus_create(struct snd_card *card,
-                                         struct sbus_dev *sdev,
+                                         struct of_device *op,
                                          int dev)
 {
         struct snd_cs4231 *chip = card->private_data;
@@ -1827,13 +1805,13 @@ static int __init snd_cs4231_sbus_create(struct snd_card *card,
         spin_lock_init(&chip->p_dma.sbus_info.lock);
         mutex_init(&chip->mce_mutex);
         mutex_init(&chip->open_mutex);
-        chip->dev_u.sdev = sdev;
-        chip->regs_size = sdev->reg_addrs[0].reg_size;
+        chip->op = op;
+        chip->regs_size = resource_size(&op->resource[0]);
         memcpy(&chip->image, &snd_cs4231_original_image,
                sizeof(snd_cs4231_original_image));
 
-        chip->port = sbus_ioremap(&sdev->resource[0], 0,
-                                  chip->regs_size, "cs4231");
+        chip->port = of_ioremap(&op->resource[0], 0,
+                                chip->regs_size, "cs4231");
         if (!chip->port) {
                 snd_printdd("cs4231-%d: Unable to map chip registers.\n", dev);
                 return -EIO;
@@ -1848,22 +1826,20 @@ static int __init snd_cs4231_sbus_create(struct snd_card *card,
         chip->p_dma.enable = sbus_dma_enable;
         chip->p_dma.request = sbus_dma_request;
         chip->p_dma.address = sbus_dma_addr;
-        chip->p_dma.preallocate = sbus_dma_preallocate;
 
         chip->c_dma.prepare = sbus_dma_prepare;
         chip->c_dma.enable = sbus_dma_enable;
         chip->c_dma.request = sbus_dma_request;
         chip->c_dma.address = sbus_dma_addr;
-        chip->c_dma.preallocate = sbus_dma_preallocate;
 
-        if (request_irq(sdev->irqs[0], snd_cs4231_sbus_interrupt,
+        if (request_irq(op->irqs[0], snd_cs4231_sbus_interrupt,
                         IRQF_SHARED, "cs4231", chip)) {
                 snd_printdd("cs4231-%d: Unable to grab SBUS IRQ %d\n",
-                            dev, sdev->irqs[0]);
+                            dev, op->irqs[0]);
                 snd_cs4231_sbus_free(chip);
                 return -EBUSY;
         }
-        chip->irq[0] = sdev->irqs[0];
+        chip->irq[0] = op->irqs[0];
 
         if (snd_cs4231_probe(chip) < 0) {
                 snd_cs4231_sbus_free(chip);
@@ -1880,9 +1856,9 @@ static int __init snd_cs4231_sbus_create(struct snd_card *card,
         return 0;
 }
 
-static int __init cs4231_sbus_attach(struct sbus_dev *sdev)
+static int __devinit cs4231_sbus_probe(struct of_device *op, const struct of_device_id *match)
 {
-        struct resource *rp = &sdev->resource[0];
+        struct resource *rp = &op->resource[0];
         struct snd_card *card;
         int err;
 
@@ -1894,9 +1870,9 @@ static int __init cs4231_sbus_attach(struct sbus_dev *sdev)
                 card->shortname,
                 rp->flags & 0xffL,
                 (unsigned long long)rp->start,
-                sdev->irqs[0]);
+                op->irqs[0]);
 
-        err = snd_cs4231_sbus_create(card, sdev, dev);
+        err = snd_cs4231_sbus_create(card, op, dev);
         if (err < 0) {
                 snd_card_free(card);
                 return err;
@@ -1949,30 +1925,25 @@ static unsigned int _ebus_dma_addr(struct cs4231_dma_control *dma_cont)
         return ebus_dma_addr(&dma_cont->ebus_info);
 }
 
-static void _ebus_dma_preallocate(struct snd_cs4231 *chip, struct snd_pcm *pcm)
-{
-        snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,
-                                      snd_dma_pci_data(chip->dev_u.pdev),
-                                      64*1024, 128*1024);
-}
-
 /*
  * Init and exit routines
  */
 
 static int snd_cs4231_ebus_free(struct snd_cs4231 *chip)
 {
+        struct of_device *op = chip->op;
+
         if (chip->c_dma.ebus_info.regs) {
                 ebus_dma_unregister(&chip->c_dma.ebus_info);
-                iounmap(chip->c_dma.ebus_info.regs);
+                of_iounmap(&op->resource[2], chip->c_dma.ebus_info.regs, 0x10);
         }
         if (chip->p_dma.ebus_info.regs) {
                 ebus_dma_unregister(&chip->p_dma.ebus_info);
-                iounmap(chip->p_dma.ebus_info.regs);
+                of_iounmap(&op->resource[1], chip->p_dma.ebus_info.regs, 0x10);
         }
 
         if (chip->port)
-                iounmap(chip->port);
+                of_iounmap(&op->resource[0], chip->port, 0x10);
 
         return 0;
 }
@@ -1989,7 +1960,7 @@ static struct snd_device_ops snd_cs4231_ebus_dev_ops = {
 };
 
 static int __init snd_cs4231_ebus_create(struct snd_card *card,
-                                         struct linux_ebus_device *edev,
+                                         struct of_device *op,
                                          int dev)
 {
         struct snd_cs4231 *chip = card->private_data;
@@ -2001,35 +1972,35 @@ static int __init snd_cs4231_ebus_create(struct snd_card *card,
         mutex_init(&chip->mce_mutex);
         mutex_init(&chip->open_mutex);
         chip->flags |= CS4231_FLAG_EBUS;
-        chip->dev_u.pdev = edev->bus->self;
+        chip->op = op;
         memcpy(&chip->image, &snd_cs4231_original_image,
                sizeof(snd_cs4231_original_image));
         strcpy(chip->c_dma.ebus_info.name, "cs4231(capture)");
         chip->c_dma.ebus_info.flags = EBUS_DMA_FLAG_USE_EBDMA_HANDLER;
         chip->c_dma.ebus_info.callback = snd_cs4231_ebus_capture_callback;
         chip->c_dma.ebus_info.client_cookie = chip;
-        chip->c_dma.ebus_info.irq = edev->irqs[0];
+        chip->c_dma.ebus_info.irq = op->irqs[0];
         strcpy(chip->p_dma.ebus_info.name, "cs4231(play)");
         chip->p_dma.ebus_info.flags = EBUS_DMA_FLAG_USE_EBDMA_HANDLER;
         chip->p_dma.ebus_info.callback = snd_cs4231_ebus_play_callback;
         chip->p_dma.ebus_info.client_cookie = chip;
-        chip->p_dma.ebus_info.irq = edev->irqs[1];
+        chip->p_dma.ebus_info.irq = op->irqs[1];
 
         chip->p_dma.prepare = _ebus_dma_prepare;
         chip->p_dma.enable = _ebus_dma_enable;
         chip->p_dma.request = _ebus_dma_request;
         chip->p_dma.address = _ebus_dma_addr;
-        chip->p_dma.preallocate = _ebus_dma_preallocate;
 
         chip->c_dma.prepare = _ebus_dma_prepare;
         chip->c_dma.enable = _ebus_dma_enable;
         chip->c_dma.request = _ebus_dma_request;
         chip->c_dma.address = _ebus_dma_addr;
-        chip->c_dma.preallocate = _ebus_dma_preallocate;
 
-        chip->port = ioremap(edev->resource[0].start, 0x10);
-        chip->p_dma.ebus_info.regs = ioremap(edev->resource[1].start, 0x10);
-        chip->c_dma.ebus_info.regs = ioremap(edev->resource[2].start, 0x10);
+        chip->port = of_ioremap(&op->resource[0], 0, 0x10, "cs4231");
+        chip->p_dma.ebus_info.regs =
+                of_ioremap(&op->resource[1], 0, 0x10, "cs4231_pdma");
+        chip->c_dma.ebus_info.regs =
+                of_ioremap(&op->resource[2], 0, 0x10, "cs4231_cdma");
         if (!chip->port || !chip->p_dma.ebus_info.regs ||
             !chip->c_dma.ebus_info.regs) {
                 snd_cs4231_ebus_free(chip);
@@ -2077,7 +2048,7 @@ static int __init snd_cs4231_ebus_create(struct snd_card *card,
         return 0;
 }
 
-static int __init cs4231_ebus_attach(struct linux_ebus_device *edev)
+static int __devinit cs4231_ebus_probe(struct of_device *op, const struct of_device_id *match)
 {
         struct snd_card *card;
         int err;
@@ -2088,10 +2059,10 @@ static int __init cs4231_ebus_attach(struct linux_ebus_device *edev)
 
         sprintf(card->longname, "%s at 0x%lx, irq %d",
                 card->shortname,
-                edev->resource[0].start,
-                edev->irqs[0]);
+                op->resource[0].start,
+                op->irqs[0]);
 
-        err = snd_cs4231_ebus_create(card, edev, dev);
+        err = snd_cs4231_ebus_create(card, op, dev);
         if (err < 0) {
                 snd_card_free(card);
                 return err;
@@ -2101,68 +2072,57 @@ static int __init cs4231_ebus_attach(struct linux_ebus_device *edev)
 }
 #endif
 
-static int __init cs4231_init(void)
+static int __devinit cs4231_probe(struct of_device *op, const struct of_device_id *match)
 {
-#ifdef SBUS_SUPPORT
-        struct sbus_bus *sbus;
-        struct sbus_dev *sdev;
-#endif
 #ifdef EBUS_SUPPORT
-        struct linux_ebus *ebus;
-        struct linux_ebus_device *edev;
+        if (!strcmp(op->node->parent->name, "ebus"))
+                return cs4231_ebus_probe(op, match);
 #endif
-        int found;
-
-        found = 0;
-
 #ifdef SBUS_SUPPORT
-        for_all_sbusdev(sdev, sbus) {
-                if (!strcmp(sdev->prom_name, "SUNW,CS4231")) {
-                        if (cs4231_sbus_attach(sdev) == 0)
-                                found++;
-                }
-        }
+        if (!strcmp(op->node->parent->name, "sbus") ||
+            !strcmp(op->node->parent->name, "sbi"))
+                return cs4231_sbus_probe(op, match);
 #endif
-#ifdef EBUS_SUPPORT
-        for_each_ebus(ebus) {
-                for_each_ebusdev(edev, ebus) {
-                        int match = 0;
-
-                        if (!strcmp(edev->prom_node->name, "SUNW,CS4231")) {
-                                match = 1;
-                        } else if (!strcmp(edev->prom_node->name, "audio")) {
-                                const char *compat;
-
-                                compat = of_get_property(edev->prom_node,
-                                                         "compatible", NULL);
-                                if (compat && !strcmp(compat, "SUNW,CS4231"))
-                                        match = 1;
-                        }
+        return -ENODEV;
+}
 
-                        if (match &&
-                            cs4231_ebus_attach(edev) == 0)
-                                found++;
-                }
-        }
-#endif
+static int __devexit cs4231_remove(struct of_device *op)
+{
+        struct snd_cs4231 *chip = dev_get_drvdata(&op->dev);
 
+        snd_card_free(chip->card);
 
-        return (found > 0) ? 0 : -EIO;
+        return 0;
 }
 
-static void __exit cs4231_exit(void)
-{
-        struct snd_cs4231 *p = cs4231_list;
+static const struct of_device_id cs4231_match[] = {
+        {
+                .name = "SUNW,CS4231",
+        },
+        {
+                .name = "audio",
+                .compatible = "SUNW,CS4231",
+        },
+        {},
+};
 
-        while (p != NULL) {
-                struct snd_cs4231 *next = p->next;
+MODULE_DEVICE_TABLE(of, cs4231_match);
 
-                snd_card_free(p->card);
+static struct of_platform_driver cs4231_driver = {
+        .name           = "audio",
+        .match_table    = cs4231_match,
+        .probe          = cs4231_probe,
+        .remove         = __devexit_p(cs4231_remove),
+};
 
-                p = next;
-        }
+static int __init cs4231_init(void)
+{
+        return of_register_driver(&cs4231_driver, &of_bus_type);
+}
 
-        cs4231_list = NULL;
+static void __exit cs4231_exit(void)
+{
+        of_unregister_driver(&cs4231_driver);
 }
 
 module_init(cs4231_init);
diff --git a/sound/sparc/dbri.c b/sound/sparc/dbri.c
index ee2e1b4f3551..c257ad8bdfbc 100644
--- a/sound/sparc/dbri.c
+++ b/sound/sparc/dbri.c
@@ -57,6 +57,7 @@
 #include <linux/delay.h>
 #include <linux/irq.h>
 #include <linux/io.h>
+#include <linux/dma-mapping.h>
 
 #include <sound/core.h>
 #include <sound/pcm.h>
@@ -66,7 +67,7 @@
 #include <sound/initval.h>
 
 #include <linux/of.h>
-#include <asm/sbus.h>
+#include <linux/of_device.h>
 #include <asm/atomic.h>
 
 MODULE_AUTHOR("Rudolf Koenig, Brent Baccala and Martin Habets");
@@ -297,7 +298,7 @@ struct dbri_streaminfo {
 /* This structure holds the information for both chips (DBRI & CS4215) */
 struct snd_dbri {
         int regs_size, irq;     /* Needed for unload */
-        struct sbus_dev *sdev;  /* SBUS device info */
+        struct of_device *op;   /* OF device info */
         spinlock_t lock;
 
         struct dbri_dma *dma;   /* Pointer to our DMA block */
@@ -2093,14 +2094,15 @@ static int snd_dbri_hw_params(struct snd_pcm_substream *substream,
          */
         if (info->dvma_buffer == 0) {
                 if (DBRI_STREAMNO(substream) == DBRI_PLAY)
-                        direction = SBUS_DMA_TODEVICE;
+                        direction = DMA_TO_DEVICE;
                 else
-                        direction = SBUS_DMA_FROMDEVICE;
+                        direction = DMA_FROM_DEVICE;
 
-                info->dvma_buffer = sbus_map_single(dbri->sdev,
-                                        runtime->dma_area,
-                                        params_buffer_bytes(hw_params),
-                                        direction);
+                info->dvma_buffer =
+                        dma_map_single(&dbri->op->dev,
+                                       runtime->dma_area,
+                                       params_buffer_bytes(hw_params),
+                                       direction);
         }
 
         direction = params_buffer_bytes(hw_params);
@@ -2121,12 +2123,12 @@ static int snd_dbri_hw_free(struct snd_pcm_substream *substream)
          */
         if (info->dvma_buffer) {
                 if (DBRI_STREAMNO(substream) == DBRI_PLAY)
-                        direction = SBUS_DMA_TODEVICE;
+                        direction = DMA_TO_DEVICE;
                 else
-                        direction = SBUS_DMA_FROMDEVICE;
+                        direction = DMA_FROM_DEVICE;
 
-                sbus_unmap_single(dbri->sdev, info->dvma_buffer,
-                                  substream->runtime->buffer_size, direction);
+                dma_unmap_single(&dbri->op->dev, info->dvma_buffer,
+                                 substream->runtime->buffer_size, direction);
                 info->dvma_buffer = 0;
         }
         if (info->pipe != -1) {
@@ -2223,7 +2225,6 @@ static int __devinit snd_dbri_pcm(struct snd_card *card)
                                /* playback count */ 1,
                                /* capture count */  1, &pcm)) < 0)
                 return err;
-        snd_assert(pcm != NULL, return -EINVAL);
 
         snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_dbri_ops);
         snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_dbri_ops);
@@ -2263,9 +2264,10 @@ static int snd_cs4215_get_volume(struct snd_kcontrol *kcontrol,
 {
         struct snd_dbri *dbri = snd_kcontrol_chip(kcontrol);
         struct dbri_streaminfo *info;
-        snd_assert(dbri != NULL, return -EINVAL);
+
+        if (snd_BUG_ON(!dbri))
+                return -EINVAL;
         info = &dbri->stream_info[kcontrol->private_value];
-        snd_assert(info != NULL, return -EINVAL);
 
         ucontrol->value.integer.value[0] = info->left_gain;
         ucontrol->value.integer.value[1] = info->right_gain;
@@ -2331,7 +2333,9 @@ static int snd_cs4215_get_single(struct snd_kcontrol *kcontrol,
         int shift = (kcontrol->private_value >> 8) & 0xff;
         int mask = (kcontrol->private_value >> 16) & 0xff;
         int invert = (kcontrol->private_value >> 24) & 1;
-        snd_assert(dbri != NULL, return -EINVAL);
+
+        if (snd_BUG_ON(!dbri))
+                return -EINVAL;
 
         if (elem < 4)
                 ucontrol->value.integer.value[0] =
@@ -2356,7 +2360,9 @@ static int snd_cs4215_put_single(struct snd_kcontrol *kcontrol,
         int invert = (kcontrol->private_value >> 24) & 1;
         int changed = 0;
         unsigned short val;
-        snd_assert(dbri != NULL, return -EINVAL);
+
+        if (snd_BUG_ON(!dbri))
+                return -EINVAL;
 
         val = (ucontrol->value.integer.value[0] & mask);
         if (invert == 1)
@@ -2432,7 +2438,8 @@ static int __devinit snd_dbri_mixer(struct snd_card *card)
         int idx, err;
         struct snd_dbri *dbri;
 
-        snd_assert(card != NULL && card->private_data != NULL, return -EINVAL);
+        if (snd_BUG_ON(!card || !card->private_data))
+                return -EINVAL;
         dbri = card->private_data;
 
         strcpy(card->mixername, card->shortname);
@@ -2514,31 +2521,32 @@ static void __devinit snd_dbri_proc(struct snd_card *card)
 static void snd_dbri_free(struct snd_dbri *dbri);
 
 static int __devinit snd_dbri_create(struct snd_card *card,
-                                  struct sbus_dev *sdev,
-                                  int irq, int dev)
+                                     struct of_device *op,
+                                     int irq, int dev)
 {
         struct snd_dbri *dbri = card->private_data;
         int err;
 
         spin_lock_init(&dbri->lock);
-        dbri->sdev = sdev;
+        dbri->op = op;
         dbri->irq = irq;
 
-        dbri->dma = sbus_alloc_consistent(sdev, sizeof(struct dbri_dma),
-                                          &dbri->dma_dvma);
+        dbri->dma = dma_alloc_coherent(&op->dev,
+                                       sizeof(struct dbri_dma),
+                                       &dbri->dma_dvma, GFP_ATOMIC);
         memset((void *)dbri->dma, 0, sizeof(struct dbri_dma));
 
         dprintk(D_GEN, "DMA Cmd Block 0x%p (0x%08x)\n",
                 dbri->dma, dbri->dma_dvma);
 
         /* Map the registers into memory. */
-        dbri->regs_size = sdev->reg_addrs[0].reg_size;
-        dbri->regs = sbus_ioremap(&sdev->resource[0], 0,
-                                  dbri->regs_size, "DBRI Registers");
+        dbri->regs_size = resource_size(&op->resource[0]);
+        dbri->regs = of_ioremap(&op->resource[0], 0,
+                                dbri->regs_size, "DBRI Registers");
         if (!dbri->regs) {
                 printk(KERN_ERR "DBRI: could not allocate registers\n");
-                sbus_free_consistent(sdev, sizeof(struct dbri_dma),
-                                     (void *)dbri->dma, dbri->dma_dvma);
+                dma_free_coherent(&op->dev, sizeof(struct dbri_dma),
+                                  (void *)dbri->dma, dbri->dma_dvma);
                 return -EIO;
         }
 
@@ -2546,9 +2554,9 @@ static int __devinit snd_dbri_create(struct snd_card *card,
                           "DBRI audio", dbri);
         if (err) {
                 printk(KERN_ERR "DBRI: Can't get irq %d\n", dbri->irq);
-                sbus_iounmap(dbri->regs, dbri->regs_size);
-                sbus_free_consistent(sdev, sizeof(struct dbri_dma),
-                                     (void *)dbri->dma, dbri->dma_dvma);
+                of_iounmap(&op->resource[0], dbri->regs, dbri->regs_size);
+                dma_free_coherent(&op->dev, sizeof(struct dbri_dma),
+                                  (void *)dbri->dma, dbri->dma_dvma);
                 return err;
         }
 
@@ -2572,27 +2580,23 @@ static void snd_dbri_free(struct snd_dbri *dbri)
                 free_irq(dbri->irq, dbri);
 
         if (dbri->regs)
-                sbus_iounmap(dbri->regs, dbri->regs_size);
+                of_iounmap(&dbri->op->resource[0], dbri->regs, dbri->regs_size);
 
         if (dbri->dma)
-                sbus_free_consistent(dbri->sdev, sizeof(struct dbri_dma),
-                                     (void *)dbri->dma, dbri->dma_dvma);
+                dma_free_coherent(&dbri->op->dev,
+                                  sizeof(struct dbri_dma),
+                                  (void *)dbri->dma, dbri->dma_dvma);
 }
 
-static int __devinit dbri_probe(struct of_device *of_dev,
-                                const struct of_device_id *match)
+static int __devinit dbri_probe(struct of_device *op, const struct of_device_id *match)
 {
-        struct sbus_dev *sdev = to_sbus_device(&of_dev->dev);
         struct snd_dbri *dbri;
-        int irq;
         struct resource *rp;
         struct snd_card *card;
         static int dev = 0;
+        int irq;
         int err;
 
-        dprintk(D_GEN, "DBRI: Found %s in SBUS slot %d\n",
-                sdev->prom_name, sdev->slot);
-
         if (dev >= SNDRV_CARDS)
                 return -ENODEV;
         if (!enable[dev]) {
@@ -2600,7 +2604,7 @@ static int __devinit dbri_probe(struct of_device *of_dev,
                 return -ENOENT;
         }
 
-        irq = sdev->irqs[0];
+        irq = op->irqs[0];
         if (irq <= 0) {
                 printk(KERN_ERR "DBRI-%d: No IRQ.\n", dev);
                 return -ENODEV;
@@ -2613,12 +2617,12 @@ static int __devinit dbri_probe(struct of_device *of_dev,
 
         strcpy(card->driver, "DBRI");
         strcpy(card->shortname, "Sun DBRI");
-        rp = &sdev->resource[0];
+        rp = &op->resource[0];
         sprintf(card->longname, "%s at 0x%02lx:0x%016Lx, irq %d",
                 card->shortname,
                 rp->flags & 0xffL, (unsigned long long)rp->start, irq);
 
-        err = snd_dbri_create(card, sdev, irq, dev);
+        err = snd_dbri_create(card, op, irq, dev);
         if (err < 0) {
                 snd_card_free(card);
                 return err;
@@ -2635,7 +2639,7 @@ static int __devinit dbri_probe(struct of_device *of_dev,
 
         /* /proc file handling */
         snd_dbri_proc(card);
-        dev_set_drvdata(&of_dev->dev, card);
+        dev_set_drvdata(&op->dev, card);
 
         err = snd_card_register(card);
         if (err < 0)
@@ -2643,7 +2647,7 @@ static int __devinit dbri_probe(struct of_device *of_dev,
 
         printk(KERN_INFO "audio%d at %p (irq %d) is DBRI(%c)+CS4215(%d)\n",
                dev, dbri->regs,
-               dbri->irq, sdev->prom_name[9], dbri->mm.version);
+               dbri->irq, op->node->name[9], dbri->mm.version);
         dev++;
 
         return 0;
@@ -2654,19 +2658,19 @@ _err:
         return err;
 }
 
-static int __devexit dbri_remove(struct of_device *dev)
+static int __devexit dbri_remove(struct of_device *op)
 {
-        struct snd_card *card = dev_get_drvdata(&dev->dev);
+        struct snd_card *card = dev_get_drvdata(&op->dev);
 
         snd_dbri_free(card->private_data);
         snd_card_free(card);
 
-        dev_set_drvdata(&dev->dev, NULL);
+        dev_set_drvdata(&op->dev, NULL);
 
         return 0;
 }
 
-static struct of_device_id dbri_match[] = {
+static const struct of_device_id dbri_match[] = {
         {
                 .name = "SUNW,DBRIe",
         },
@@ -2688,7 +2692,7 @@ static struct of_platform_driver dbri_sbus_driver = {
 /* Probe for the dbri chip and then attach the driver. */
 static int __init dbri_init(void)
 {
-        return of_register_driver(&dbri_sbus_driver, &sbus_bus_type);
+        return of_register_driver(&dbri_sbus_driver, &of_bus_type);
 }
 
 static void __exit dbri_exit(void)