diff options
| author |   Takashi Sakamoto <o-takashi@sakamocchi.jp> | 2020-05-08 13:36:27 +0900 |
|---|---|---|
| committer |   Takashi Iwai <tiwai@suse.de> | 2020-05-08 09:44:22 +0200 |
| commit | 10aa8e4acf51b12a2db4ee2baaed67f70fbee9c2 (patch) | |
| tree | d33c1daadcb54d29f07228e354cd61f19005f86f /sound/firewire | |
| parent | ALSA: firewire-lib: fix invalid assignment to union data for directional parameter (diff) | |
| download | linux-dev-10aa8e4acf51b12a2db4ee2baaed67f70fbee9c2.tar.xz linux-dev-10aa8e4acf51b12a2db4ee2baaed67f70fbee9c2.zip | |
ALSA: firewire-lib: use macro for maximum value of second in 1394 OHCI isoc descriptor
In descriptor of isochronous context in 1394 OHCI, the field of second
has 3 bit, thus the maximum value is 8. The value is used for correct
cycle calculation.
This commit replaces hard-coded value with macro to obsolete magic
number.
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Link: https://lore.kernel.org/r/20200508043635.349339-3-o-takashi@sakamocchi.jp
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/firewire')
| -rw-r--r-- | sound/firewire/amdtp-stream.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sound/firewire/amdtp-stream.c b/sound/firewire/amdtp-stream.c index 37d38efb4c87..fcde01b54d11 100644 --- a/sound/firewire/amdtp-stream.c +++ b/sound/firewire/amdtp-stream.c @@ -20,6 +20,8 @@ #define CYCLES_PER_SECOND 8000 #define TICKS_PER_SECOND (TICKS_PER_CYCLE * CYCLES_PER_SECOND) +#define OHCI_MAX_SECOND 8 + /* Always support Linux tracing subsystem. */ #define CREATE_TRACE_POINTS #include "amdtp-stream-trace.h" @@ -680,8 +682,8 @@ static inline u32 compute_cycle_count(__be32 ctx_header_tstamp) static inline u32 increment_cycle_count(u32 cycle, unsigned int addend) { cycle += addend; - if (cycle >= 8 * CYCLES_PER_SECOND) - cycle -= 8 * CYCLES_PER_SECOND; + if (cycle >= OHCI_MAX_SECOND * CYCLES_PER_SECOND) + cycle -= OHCI_MAX_SECOND * CYCLES_PER_SECOND; return cycle; } |