3 files changed, 6 insertions, 53 deletions

diff --git a/sound/core/init.c b/sound/core/init.c
index 8af467df9245..ef2352c2e451 100644
--- a/sound/core/init.c
+++ b/sound/core/init.c
@@ -549,9 +549,9 @@ int snd_card_register(struct snd_card *card)
                 return -EINVAL;
 #ifndef CONFIG_SYSFS_DEPRECATED
         if (!card->card_dev) {
-                card->card_dev = device_create_drvdata(sound_class, card->dev,
-                                                       MKDEV(0, 0), NULL,
-                                                       "card%i", card->number);
+                card->card_dev = device_create(sound_class, card->dev,
+                                               MKDEV(0, 0), NULL,
+                                               "card%i", card->number);
                 if (IS_ERR(card->card_dev))
                         card->card_dev = NULL;
         }
diff --git a/sound/core/memalloc.c b/sound/core/memalloc.c
index a7b46ec72f32..1b3534d67686 100644
--- a/sound/core/memalloc.c
+++ b/sound/core/memalloc.c
@@ -33,9 +33,6 @@
 #include <linux/moduleparam.h>
 #include <linux/mutex.h>
 #include <sound/memalloc.h>
-#ifdef CONFIG_SBUS
-#include <asm/sbus.h>
-#endif
 
 
 MODULE_AUTHOR("Takashi Iwai <tiwai@suse.de>, Jaroslav Kysela <perex@perex.cz>");
@@ -162,39 +159,6 @@ static void snd_free_dev_pages(struct device *dev, size_t size, void *ptr,
 }
 #endif /* CONFIG_HAS_DMA */
 
-#ifdef CONFIG_SBUS
-
-static void *snd_malloc_sbus_pages(struct device *dev, size_t size,
-                                   dma_addr_t *dma_addr)
-{
-        struct sbus_dev *sdev = (struct sbus_dev *)dev;
-        int pg;
-        void *res;
-
-        if (WARN_ON(!dma_addr))
-                return NULL;
-        pg = get_order(size);
-        res = sbus_alloc_consistent(sdev, PAGE_SIZE * (1 << pg), dma_addr);
-        if (res != NULL)
-                inc_snd_pages(pg);
-        return res;
-}
-
-static void snd_free_sbus_pages(struct device *dev, size_t size,
-                                void *ptr, dma_addr_t dma_addr)
-{
-        struct sbus_dev *sdev = (struct sbus_dev *)dev;
-        int pg;
-
-        if (ptr == NULL)
-                return;
-        pg = get_order(size);
-        dec_snd_pages(pg);
-        sbus_free_consistent(sdev, PAGE_SIZE * (1 << pg), ptr, dma_addr);
-}
-
-#endif /* CONFIG_SBUS */
-
 /*
  *
  *  ALSA generic memory management
@@ -231,11 +195,6 @@ int snd_dma_alloc_pages(int type, struct device *device, size_t size,
                 dmab->area = snd_malloc_pages(size, (unsigned long)device);
                 dmab->addr = 0;
                 break;
-#ifdef CONFIG_SBUS
-        case SNDRV_DMA_TYPE_SBUS:
-                dmab->area = snd_malloc_sbus_pages(device, size, &dmab->addr);
-                break;
-#endif
 #ifdef CONFIG_HAS_DMA
         case SNDRV_DMA_TYPE_DEV:
                 dmab->area = snd_malloc_dev_pages(device, size, &dmab->addr);
@@ -306,11 +265,6 @@ void snd_dma_free_pages(struct snd_dma_buffer *dmab)
         case SNDRV_DMA_TYPE_CONTINUOUS:
                 snd_free_pages(dmab->area, dmab->bytes);
                 break;
-#ifdef CONFIG_SBUS
-        case SNDRV_DMA_TYPE_SBUS:
-                snd_free_sbus_pages(dmab->dev.dev, dmab->bytes, dmab->area, dmab->addr);
-                break;
-#endif
 #ifdef CONFIG_HAS_DMA
         case SNDRV_DMA_TYPE_DEV:
                 snd_free_dev_pages(dmab->dev.dev, dmab->bytes, dmab->area, dmab->addr);
@@ -419,7 +373,7 @@ static int snd_mem_proc_read(struct seq_file *seq, void *offset)
         long pages = snd_allocated_pages >> (PAGE_SHIFT-12);
         struct snd_mem_list *mem;
         int devno;
-        static char *types[] = { "UNKNOWN", "CONT", "DEV", "DEV-SG", "SBUS" };
+        static char *types[] = { "UNKNOWN", "CONT", "DEV", "DEV-SG" };
 
         mutex_lock(&list_mutex);
         seq_printf(seq, "pages  : %li bytes (%li pages per %likB)\n",
diff --git a/sound/core/sound.c b/sound/core/sound.c
index c0685e2f0afa..44a69bb8d4f0 100644
--- a/sound/core/sound.c
+++ b/sound/core/sound.c
@@ -274,9 +274,8 @@ int snd_register_device_for_dev(int type, struct snd_card *card, int dev,
                 return minor;
         }
         snd_minors[minor] = preg;
-        preg->dev = device_create_drvdata(sound_class, device,
-                                          MKDEV(major, minor),
-                                          private_data, "%s", name);
+        preg->dev = device_create(sound_class, device, MKDEV(major, minor),
+                                  private_data, "%s", name);
         if (IS_ERR(preg->dev)) {
                 snd_minors[minor] = NULL;
                 mutex_unlock(&sound_mutex);