aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2014-11-10 11:24:26 -0500
committerTakashi Iwai <tiwai@suse.de>2014-11-11 03:39:17 -0500
commitddcecf6b6ae7b91c8735e52f50cd403ee9cbe298 (patch)
treed2f6c86c6785370b581d463c07fd5f8424dca9b4
parent3f60c87d129acbb232afbc7269c726d009a01869 (diff)
ALSA: Fix invalid kerneldoc markers
They are no real kerneldoc comments, so drop such markers. Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--include/uapi/sound/hdspm.h12
-rw-r--r--sound/pci/emu10k1/emu10k1x.c2
-rw-r--r--sound/pci/lx6464es/lx_defs.h2
-rw-r--r--sound/pci/rme9652/hdspm.c48
4 files changed, 32 insertions, 32 deletions
diff --git a/include/uapi/sound/hdspm.h b/include/uapi/sound/hdspm.h
index d956c3593f65..b357f1a5e29c 100644
--- a/include/uapi/sound/hdspm.h
+++ b/include/uapi/sound/hdspm.h
@@ -74,14 +74,14 @@ struct hdspm_config {
74#define SNDRV_HDSPM_IOCTL_GET_CONFIG \ 74#define SNDRV_HDSPM_IOCTL_GET_CONFIG \
75 _IOR('H', 0x41, struct hdspm_config) 75 _IOR('H', 0x41, struct hdspm_config)
76 76
77/** 77/*
78 * If there's a TCO (TimeCode Option) board installed, 78 * If there's a TCO (TimeCode Option) board installed,
79 * there are further options and status data available. 79 * there are further options and status data available.
80 * The hdspm_ltc structure contains the current SMPTE 80 * The hdspm_ltc structure contains the current SMPTE
81 * timecode and some status information and can be 81 * timecode and some status information and can be
82 * obtained via SNDRV_HDSPM_IOCTL_GET_LTC or in the 82 * obtained via SNDRV_HDSPM_IOCTL_GET_LTC or in the
83 * hdspm_status struct. 83 * hdspm_status struct.
84 **/ 84 */
85 85
86enum hdspm_ltc_format { 86enum hdspm_ltc_format {
87 format_invalid, 87 format_invalid,
@@ -113,11 +113,11 @@ struct hdspm_ltc {
113 113
114#define SNDRV_HDSPM_IOCTL_GET_LTC _IOR('H', 0x46, struct hdspm_ltc) 114#define SNDRV_HDSPM_IOCTL_GET_LTC _IOR('H', 0x46, struct hdspm_ltc)
115 115
116/** 116/*
117 * The status data reflects the device's current state 117 * The status data reflects the device's current state
118 * as determined by the card's configuration and 118 * as determined by the card's configuration and
119 * connection status. 119 * connection status.
120 **/ 120 */
121 121
122enum hdspm_sync { 122enum hdspm_sync {
123 hdspm_sync_no_lock = 0, 123 hdspm_sync_no_lock = 0,
@@ -171,9 +171,9 @@ struct hdspm_status {
171#define SNDRV_HDSPM_IOCTL_GET_STATUS \ 171#define SNDRV_HDSPM_IOCTL_GET_STATUS \
172 _IOR('H', 0x47, struct hdspm_status) 172 _IOR('H', 0x47, struct hdspm_status)
173 173
174/** 174/*
175 * Get information about the card and its add-ons. 175 * Get information about the card and its add-ons.
176 **/ 176 */
177 177
178#define HDSPM_ADDON_TCO 1 178#define HDSPM_ADDON_TCO 1
179 179
diff --git a/sound/pci/emu10k1/emu10k1x.c b/sound/pci/emu10k1/emu10k1x.c
index e223de1408c0..15933f92f63a 100644
--- a/sound/pci/emu10k1/emu10k1x.c
+++ b/sound/pci/emu10k1/emu10k1x.c
@@ -180,7 +180,7 @@ MODULE_PARM_DESC(enable, "Enable the EMU10K1X soundcard.");
180 180
181/* From 0x50 - 0x5f, last samples captured */ 181/* From 0x50 - 0x5f, last samples captured */
182 182
183/** 183/*
184 * The hardware has 3 channels for playback and 1 for capture. 184 * The hardware has 3 channels for playback and 1 for capture.
185 * - channel 0 is the front channel 185 * - channel 0 is the front channel
186 * - channel 1 is the rear channel 186 * - channel 1 is the rear channel
diff --git a/sound/pci/lx6464es/lx_defs.h b/sound/pci/lx6464es/lx_defs.h
index 49d36bdd512c..469bcc685edf 100644
--- a/sound/pci/lx6464es/lx_defs.h
+++ b/sound/pci/lx6464es/lx_defs.h
@@ -175,7 +175,7 @@ enum buffer_flags {
175 BF_ZERO = 0x00, /* no flags (init).*/ 175 BF_ZERO = 0x00, /* no flags (init).*/
176}; 176};
177 177
178/** 178/*
179* Stream Flags definitions 179* Stream Flags definitions
180*/ 180*/
181enum stream_flags { 181enum stream_flags {
diff --git a/sound/pci/rme9652/hdspm.c b/sound/pci/rme9652/hdspm.c
index e09348c156d8..3342705a5715 100644
--- a/sound/pci/rme9652/hdspm.c
+++ b/sound/pci/rme9652/hdspm.c
@@ -2201,10 +2201,10 @@ static inline int hdspm_get_pll_freq(struct hdspm *hdspm)
2201 return rate; 2201 return rate;
2202} 2202}
2203 2203
2204/** 2204/*
2205 * Calculate the real sample rate from the 2205 * Calculate the real sample rate from the
2206 * current DDS value. 2206 * current DDS value.
2207 **/ 2207 */
2208static int hdspm_get_system_sample_rate(struct hdspm *hdspm) 2208static int hdspm_get_system_sample_rate(struct hdspm *hdspm)
2209{ 2209{
2210 unsigned int rate; 2210 unsigned int rate;
@@ -2270,9 +2270,9 @@ static int snd_hdspm_put_system_sample_rate(struct snd_kcontrol *kcontrol,
2270} 2270}
2271 2271
2272 2272
2273/** 2273/*
2274 * Returns the WordClock sample rate class for the given card. 2274 * Returns the WordClock sample rate class for the given card.
2275 **/ 2275 */
2276static int hdspm_get_wc_sample_rate(struct hdspm *hdspm) 2276static int hdspm_get_wc_sample_rate(struct hdspm *hdspm)
2277{ 2277{
2278 int status; 2278 int status;
@@ -2295,9 +2295,9 @@ static int hdspm_get_wc_sample_rate(struct hdspm *hdspm)
2295} 2295}
2296 2296
2297 2297
2298/** 2298/*
2299 * Returns the TCO sample rate class for the given card. 2299 * Returns the TCO sample rate class for the given card.
2300 **/ 2300 */
2301static int hdspm_get_tco_sample_rate(struct hdspm *hdspm) 2301static int hdspm_get_tco_sample_rate(struct hdspm *hdspm)
2302{ 2302{
2303 int status; 2303 int status;
@@ -2321,9 +2321,9 @@ static int hdspm_get_tco_sample_rate(struct hdspm *hdspm)
2321} 2321}
2322 2322
2323 2323
2324/** 2324/*
2325 * Returns the SYNC_IN sample rate class for the given card. 2325 * Returns the SYNC_IN sample rate class for the given card.
2326 **/ 2326 */
2327static int hdspm_get_sync_in_sample_rate(struct hdspm *hdspm) 2327static int hdspm_get_sync_in_sample_rate(struct hdspm *hdspm)
2328{ 2328{
2329 int status; 2329 int status;
@@ -2343,9 +2343,9 @@ static int hdspm_get_sync_in_sample_rate(struct hdspm *hdspm)
2343 return 0; 2343 return 0;
2344} 2344}
2345 2345
2346/** 2346/*
2347 * Returns the AES sample rate class for the given card. 2347 * Returns the AES sample rate class for the given card.
2348 **/ 2348 */
2349static int hdspm_get_aes_sample_rate(struct hdspm *hdspm, int index) 2349static int hdspm_get_aes_sample_rate(struct hdspm *hdspm, int index)
2350{ 2350{
2351 int timecode; 2351 int timecode;
@@ -2361,10 +2361,10 @@ static int hdspm_get_aes_sample_rate(struct hdspm *hdspm, int index)
2361 return 0; 2361 return 0;
2362} 2362}
2363 2363
2364/** 2364/*
2365 * Returns the sample rate class for input source <idx> for 2365 * Returns the sample rate class for input source <idx> for
2366 * 'new style' cards like the AIO and RayDAT. 2366 * 'new style' cards like the AIO and RayDAT.
2367 **/ 2367 */
2368static int hdspm_get_s1_sample_rate(struct hdspm *hdspm, unsigned int idx) 2368static int hdspm_get_s1_sample_rate(struct hdspm *hdspm, unsigned int idx)
2369{ 2369{
2370 int status = hdspm_read(hdspm, HDSPM_RD_STATUS_2); 2370 int status = hdspm_read(hdspm, HDSPM_RD_STATUS_2);
@@ -2512,10 +2512,10 @@ static int snd_hdspm_get_autosync_sample_rate(struct snd_kcontrol *kcontrol,
2512} 2512}
2513 2513
2514 2514
2515/** 2515/*
2516 * Returns the system clock mode for the given card. 2516 * Returns the system clock mode for the given card.
2517 * @returns 0 - master, 1 - slave 2517 * @returns 0 - master, 1 - slave
2518 **/ 2518 */
2519static int hdspm_system_clock_mode(struct hdspm *hdspm) 2519static int hdspm_system_clock_mode(struct hdspm *hdspm)
2520{ 2520{
2521 switch (hdspm->io_type) { 2521 switch (hdspm->io_type) {
@@ -2534,10 +2534,10 @@ static int hdspm_system_clock_mode(struct hdspm *hdspm)
2534} 2534}
2535 2535
2536 2536
2537/** 2537/*
2538 * Sets the system clock mode. 2538 * Sets the system clock mode.
2539 * @param mode 0 - master, 1 - slave 2539 * @param mode 0 - master, 1 - slave
2540 **/ 2540 */
2541static void hdspm_set_system_clock_mode(struct hdspm *hdspm, int mode) 2541static void hdspm_set_system_clock_mode(struct hdspm *hdspm, int mode)
2542{ 2542{
2543 hdspm_set_toggle_setting(hdspm, 2543 hdspm_set_toggle_setting(hdspm,
@@ -2692,11 +2692,11 @@ static int snd_hdspm_put_clock_source(struct snd_kcontrol *kcontrol,
2692} 2692}
2693 2693
2694 2694
2695/** 2695/*
2696 * Returns the current preferred sync reference setting. 2696 * Returns the current preferred sync reference setting.
2697 * The semantics of the return value are depending on the 2697 * The semantics of the return value are depending on the
2698 * card, please see the comments for clarification. 2698 * card, please see the comments for clarification.
2699 **/ 2699 */
2700static int hdspm_pref_sync_ref(struct hdspm * hdspm) 2700static int hdspm_pref_sync_ref(struct hdspm * hdspm)
2701{ 2701{
2702 switch (hdspm->io_type) { 2702 switch (hdspm->io_type) {
@@ -2795,11 +2795,11 @@ static int hdspm_pref_sync_ref(struct hdspm * hdspm)
2795} 2795}
2796 2796
2797 2797
2798/** 2798/*
2799 * Set the preferred sync reference to <pref>. The semantics 2799 * Set the preferred sync reference to <pref>. The semantics
2800 * of <pref> are depending on the card type, see the comments 2800 * of <pref> are depending on the card type, see the comments
2801 * for clarification. 2801 * for clarification.
2802 **/ 2802 */
2803static int hdspm_set_pref_sync_ref(struct hdspm * hdspm, int pref) 2803static int hdspm_set_pref_sync_ref(struct hdspm * hdspm, int pref)
2804{ 2804{
2805 int p = 0; 2805 int p = 0;
@@ -4101,9 +4101,9 @@ static int snd_hdspm_get_sync_check(struct snd_kcontrol *kcontrol,
4101 4101
4102 4102
4103 4103
4104/** 4104/*
4105 * TCO controls 4105 * TCO controls
4106 **/ 4106 */
4107static void hdspm_tco_write(struct hdspm *hdspm) 4107static void hdspm_tco_write(struct hdspm *hdspm)
4108{ 4108{
4109 unsigned int tc[4] = { 0, 0, 0, 0}; 4109 unsigned int tc[4] = { 0, 0, 0, 0};
@@ -5403,7 +5403,7 @@ static irqreturn_t snd_hdspm_interrupt(int irq, void *dev_id)
5403 HDSPM_midi2IRQPending | HDSPM_midi3IRQPending); 5403 HDSPM_midi2IRQPending | HDSPM_midi3IRQPending);
5404 5404
5405 /* now = get_cycles(); */ 5405 /* now = get_cycles(); */
5406 /** 5406 /*
5407 * LAT_2..LAT_0 period counter (win) counter (mac) 5407 * LAT_2..LAT_0 period counter (win) counter (mac)
5408 * 6 4096 ~256053425 ~514672358 5408 * 6 4096 ~256053425 ~514672358
5409 * 5 2048 ~128024983 ~257373821 5409 * 5 2048 ~128024983 ~257373821
@@ -5412,7 +5412,7 @@ static irqreturn_t snd_hdspm_interrupt(int irq, void *dev_id)
5412 * 2 256 ~16003039 ~32260176 5412 * 2 256 ~16003039 ~32260176
5413 * 1 128 ~7998738 ~16194507 5413 * 1 128 ~7998738 ~16194507
5414 * 0 64 ~3998231 ~8191558 5414 * 0 64 ~3998231 ~8191558
5415 **/ 5415 */
5416 /* 5416 /*
5417 dev_info(hdspm->card->dev, "snd_hdspm_interrupt %llu @ %llx\n", 5417 dev_info(hdspm->card->dev, "snd_hdspm_interrupt %llu @ %llx\n",
5418 now-hdspm->last_interrupt, status & 0xFFC0); 5418 now-hdspm->last_interrupt, status & 0xFFC0);