Merge branch 'topic/cleanup' into for-linus

* topic/cleanup:
  ALSA: Remove deprecated include/sound/driver.h
  ALSA: Remove deprecated snd_card_new()

diff --combined include/sound/core.h
index 0e8ae10155ab32f4593a1fb25cfa5d75c5726681,a26bbdcc676524a8c35a7cd48db5d701b94ddd2e..309cb9659a05907576fb933b822b100afd3e56bb
--- 1/include/sound/core.h
--- 2/include/sound/core.h
+++ b/include/sound/core.h
@@@ -300,20 -300,9 +300,10 @@@ int snd_card_create(int idx, const cha
                    struct module *module, int extra_size,
                    struct snd_card **card_ret);
  
- static inline __deprecated
- struct snd_card *snd_card_new(int idx, const char *id,
-                             struct module *module, int extra_size)
- {
-       struct snd_card *card;
-       if (snd_card_create(idx, id, module, extra_size, &card) < 0)
-               return NULL;
-       return card;
- }
- 
  int snd_card_disconnect(struct snd_card *card);
  int snd_card_free(struct snd_card *card);
  int snd_card_free_when_closed(struct snd_card *card);
 +void snd_card_set_id(struct snd_card *card, const char *id);
  int snd_card_register(struct snd_card *card);
  int snd_card_info_init(void);
  int snd_card_info_done(void);