ALSA: Remove snd_card_get_device_link()
There are only two users, and they can be written even simpler without
this helper.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
diff --git a/include/sound/core.h b/include/sound/core.h
index 7383e4d..7c21afd 100644
--- a/include/sound/core.h
+++ b/include/sound/core.h
@@ -193,12 +193,6 @@
#endif /* CONFIG_PM */
-/* return a device pointer linked to each sound device as a parent */
-static inline struct device *snd_card_get_device_link(struct snd_card *card)
-{
- return card ? &card->card_dev : NULL;
-}
-
/* sound.c */
extern int snd_major;
diff --git a/sound/core/jack.c b/sound/core/jack.c
index 8658578..588ef07 100644
--- a/sound/core/jack.c
+++ b/sound/core/jack.c
@@ -78,7 +78,7 @@
/* Default to the sound card device. */
if (!jack->input_dev->dev.parent)
- jack->input_dev->dev.parent = snd_card_get_device_link(card);
+ jack->input_dev->dev.parent = &card->card_dev;
/* Add capabilities for any keys that are enabled */
for (i = 0; i < ARRAY_SIZE(jack->key); i++) {
diff --git a/sound/core/sound_oss.c b/sound/core/sound_oss.c
index 21dad81..e6bc758 100644
--- a/sound/core/sound_oss.c
+++ b/sound/core/sound_oss.c
@@ -123,7 +123,7 @@
int cidx = SNDRV_MINOR_OSS_CARD(minor);
int track2 = -1;
int register1 = -1, register2 = -1;
- struct device *carddev = snd_card_get_device_link(card);
+ struct device *carddev = &card->card_dev;
if (card && card->number >= SNDRV_MINOR_OSS_DEVICES)
return 0; /* ignore silently */
