Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 5f32c314f9c2a4e2e88de3ef23aa35580a0a19e5

Authored by Takashi Iwai
1 parent bee1bb19cf
Exists in master and in 13 other branches dlt-processor-sdk-linux-03.00.00.04, processor-sdk-linux-02.00.01, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.15.y, ti-lsk-linux-4.1.y

ALSA: parisc: Convert to snd_card_new() with a device pointer 

Also remove superfluous snd_card_set_dev() calls.

Signed-off-by: Takashi Iwai <tiwai@suse.de>

Showing 1 changed file with 1 additions and 3 deletions Side-by-side Diff

sound/parisc/harmony.c
Diff comments   View file @ 5f32c31
... ... @@ -959,8 +959,6 @@
959 959 goto free_and_ret;
960 960 }
961 961  
962   - snd_card_set_dev(card, &padev->dev);
963   -
964 962 *rchip = h;
965 963  
966 964 return 0;
... ... @@ -977,7 +975,7 @@
977 975 struct snd_card *card;
978 976 struct snd_harmony *h;
979 977  
980   - err = snd_card_create(index, id, THIS_MODULE, 0, &card);
  978 + err = snd_card_new(&padev->dev, index, id, THIS_MODULE, 0, &card);
981 979 if (err < 0)
982 980 return err;
983 981