Commit d108728e authored by Takashi Iwai's avatar Takashi Iwai

Merge branch 'topic/cleanup' into for-linus

* topic/cleanup:
  ALSA: Remove deprecated include/sound/driver.h
  ALSA: Remove deprecated snd_card_new()
parents ab2f06cb ef9dfa4b
...@@ -300,16 +300,6 @@ int snd_card_create(int idx, const char *id, ...@@ -300,16 +300,6 @@ int snd_card_create(int idx, const char *id,
struct module *module, int extra_size, struct module *module, int extra_size,
struct snd_card **card_ret); 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_disconnect(struct snd_card *card);
int snd_card_free(struct snd_card *card); int snd_card_free(struct snd_card *card);
int snd_card_free_when_closed(struct snd_card *card); int snd_card_free_when_closed(struct snd_card *card);
......
#warning "This file is deprecated"
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment