diff options
author | Takashi Iwai <tiwai@suse.de> | 2019-08-14 12:27:08 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2019-08-14 13:51:24 -0400 |
commit | 53eff75e5f4dd4b9bc489955fdc60fde48d85e93 (patch) | |
tree | a92f321c63d90e5f2c361e1ec14e22b5d63a14de | |
parent | ee5f85d9290fe25d460bd320b7fe073075d72d33 (diff) |
ALSA: hda: Drop export of snd_hdac_bus_add/remove_device()
snd_hdac_bus_add_device() and snd_hdac_remove_device() are called only
internally in hda-core. Let's drop the exports of them and move the
declarations into local.h.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r-- | include/sound/hdaudio.h | 3 | ||||
-rw-r--r-- | sound/hda/hdac_bus.c | 3 | ||||
-rw-r--r-- | sound/hda/local.h | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/include/sound/hdaudio.h b/include/sound/hdaudio.h index 4af4af55e854..edb176a265c7 100644 --- a/include/sound/hdaudio.h +++ b/include/sound/hdaudio.h | |||
@@ -374,9 +374,6 @@ int snd_hdac_bus_exec_verb_unlocked(struct hdac_bus *bus, unsigned int addr, | |||
374 | unsigned int cmd, unsigned int *res); | 374 | unsigned int cmd, unsigned int *res); |
375 | void snd_hdac_bus_queue_event(struct hdac_bus *bus, u32 res, u32 res_ex); | 375 | void snd_hdac_bus_queue_event(struct hdac_bus *bus, u32 res, u32 res_ex); |
376 | 376 | ||
377 | int snd_hdac_bus_add_device(struct hdac_bus *bus, struct hdac_device *codec); | ||
378 | void snd_hdac_bus_remove_device(struct hdac_bus *bus, | ||
379 | struct hdac_device *codec); | ||
380 | void snd_hdac_bus_process_unsol_events(struct work_struct *work); | 377 | void snd_hdac_bus_process_unsol_events(struct work_struct *work); |
381 | 378 | ||
382 | static inline void snd_hdac_codec_link_up(struct hdac_device *codec) | 379 | static inline void snd_hdac_codec_link_up(struct hdac_device *codec) |
diff --git a/sound/hda/hdac_bus.c b/sound/hda/hdac_bus.c index cd25e2b3f7f2..18ed3185df82 100644 --- a/sound/hda/hdac_bus.c +++ b/sound/hda/hdac_bus.c | |||
@@ -9,6 +9,7 @@ | |||
9 | #include <linux/module.h> | 9 | #include <linux/module.h> |
10 | #include <linux/export.h> | 10 | #include <linux/export.h> |
11 | #include <sound/hdaudio.h> | 11 | #include <sound/hdaudio.h> |
12 | #include "local.h" | ||
12 | #include "trace.h" | 13 | #include "trace.h" |
13 | 14 | ||
14 | static const struct hdac_bus_ops default_ops = { | 15 | static const struct hdac_bus_ops default_ops = { |
@@ -196,7 +197,6 @@ int snd_hdac_bus_add_device(struct hdac_bus *bus, struct hdac_device *codec) | |||
196 | bus->num_codecs++; | 197 | bus->num_codecs++; |
197 | return 0; | 198 | return 0; |
198 | } | 199 | } |
199 | EXPORT_SYMBOL_GPL(snd_hdac_bus_add_device); | ||
200 | 200 | ||
201 | /** | 201 | /** |
202 | * snd_hdac_bus_remove_device - Remove a codec from bus | 202 | * snd_hdac_bus_remove_device - Remove a codec from bus |
@@ -215,7 +215,6 @@ void snd_hdac_bus_remove_device(struct hdac_bus *bus, | |||
215 | bus->num_codecs--; | 215 | bus->num_codecs--; |
216 | flush_work(&bus->unsol_work); | 216 | flush_work(&bus->unsol_work); |
217 | } | 217 | } |
218 | EXPORT_SYMBOL_GPL(snd_hdac_bus_remove_device); | ||
219 | 218 | ||
220 | #ifdef CONFIG_SND_HDA_ALIGNED_MMIO | 219 | #ifdef CONFIG_SND_HDA_ALIGNED_MMIO |
221 | /* Helpers for aligned read/write of mmio space, for Tegra */ | 220 | /* Helpers for aligned read/write of mmio space, for Tegra */ |
diff --git a/sound/hda/local.h b/sound/hda/local.h index 877631e39373..3a4e303169a6 100644 --- a/sound/hda/local.h +++ b/sound/hda/local.h | |||
@@ -33,4 +33,8 @@ int hda_widget_sysfs_reinit(struct hdac_device *codec, hda_nid_t start_nid, | |||
33 | int num_nodes); | 33 | int num_nodes); |
34 | void hda_widget_sysfs_exit(struct hdac_device *codec); | 34 | void hda_widget_sysfs_exit(struct hdac_device *codec); |
35 | 35 | ||
36 | int snd_hdac_bus_add_device(struct hdac_bus *bus, struct hdac_device *codec); | ||
37 | void snd_hdac_bus_remove_device(struct hdac_bus *bus, | ||
38 | struct hdac_device *codec); | ||
39 | |||
36 | #endif /* __HDAC_LOCAL_H */ | 40 | #endif /* __HDAC_LOCAL_H */ |