Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

[pandora-kernel.git] / sound / core / init.c

diff --git a/sound/core/init.c b/sound/core/init.c
index 2de45fb..57b792e 100644 (file)
--- a/sound/core/init.c
+++ b/sound/core/init.c
@@ -395,12 +395,10 @@ int snd_card_disconnect(struct snd_card *card)
                snd_printk(KERN_ERR "not all devices for card %i can be disconnected\n", card->number);
 
        snd_info_card_disconnect(card);
-#ifndef CONFIG_SYSFS_DEPRECATED
        if (card->card_dev) {
                device_unregister(card->card_dev);
                card->card_dev = NULL;
        }
-#endif
 #ifdef CONFIG_PM
        wake_up(&card->power_sleep);
 #endif
@@ -573,7 +571,6 @@ void snd_card_set_id(struct snd_card *card, const char *nid)
 }
 EXPORT_SYMBOL(snd_card_set_id);
 
-#ifndef CONFIG_SYSFS_DEPRECATED
 static ssize_t
 card_id_show_attr(struct device *dev,
                  struct device_attribute *attr, char *buf)
@@ -635,7 +632,6 @@ card_number_show_attr(struct device *dev,
 
 static struct device_attribute card_number_attrs =
        __ATTR(number, S_IRUGO, card_number_show_attr, NULL);
-#endif /* CONFIG_SYSFS_DEPRECATED */
 
 /**
  *  snd_card_register - register the soundcard
@@ -654,7 +650,7 @@ int snd_card_register(struct snd_card *card)
 
        if (snd_BUG_ON(!card))
                return -EINVAL;
-#ifndef CONFIG_SYSFS_DEPRECATED
+
        if (!card->card_dev) {
                card->card_dev = device_create(sound_class, card->dev,
                                               MKDEV(0, 0), card,
@@ -662,7 +658,7 @@ int snd_card_register(struct snd_card *card)
                if (IS_ERR(card->card_dev))
                        card->card_dev = NULL;
        }
-#endif
+
        if ((err = snd_device_register_all(card)) < 0)
                return err;
        mutex_lock(&snd_card_mutex);
@@ -679,7 +675,6 @@ int snd_card_register(struct snd_card *card)
        if (snd_mixer_oss_notify_callback)
                snd_mixer_oss_notify_callback(card, SND_MIXER_OSS_NOTIFY_REGISTER);
 #endif
-#ifndef CONFIG_SYSFS_DEPRECATED
        if (card->card_dev) {
                err = device_create_file(card->card_dev, &card_id_attrs);
                if (err < 0)
@@ -688,7 +683,7 @@ int snd_card_register(struct snd_card *card)
                if (err < 0)
                        return err;
        }
-#endif
+
        return 0;
 }