diff options
author | Mark Brown <broonie@kernel.org> | 2020-12-28 14:16:53 +0000 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2020-12-28 14:16:53 +0000 |
commit | f81325a05e9317f09a2e4ec57a52e4e49eb42b54 (patch) | |
tree | a5a91589c9ef8e212f2899f1462cfb5c3f0130ef /sound/usb/clock.h | |
parent | 671ee4db952449acde126965bf76817a3159040d (diff) | |
parent | 5c8fe583cce542aa0b84adc939ce85293de36e5e (diff) | |
download | lwn-f81325a05e9317f09a2e4ec57a52e4e49eb42b54.tar.gz lwn-f81325a05e9317f09a2e4ec57a52e4e49eb42b54.zip |
Merge tag 'v5.11-rc1' into asoc-5.11
Linux 5.11-rc1
Diffstat (limited to 'sound/usb/clock.h')
-rw-r--r-- | sound/usb/clock.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/sound/usb/clock.h b/sound/usb/clock.h index 68df0fbe09d0..ed9fc2dc0510 100644 --- a/sound/usb/clock.h +++ b/sound/usb/clock.h @@ -2,11 +2,14 @@ #ifndef __USBAUDIO_CLOCK_H #define __USBAUDIO_CLOCK_H -int snd_usb_init_sample_rate(struct snd_usb_audio *chip, int iface, - struct usb_host_interface *alts, - struct audioformat *fmt, int rate); +int snd_usb_init_sample_rate(struct snd_usb_audio *chip, + const struct audioformat *fmt, int rate); int snd_usb_clock_find_source(struct snd_usb_audio *chip, - struct audioformat *fmt, bool validate); + const struct audioformat *fmt, bool validate); + +int snd_usb_set_sample_rate_v2v3(struct snd_usb_audio *chip, + const struct audioformat *fmt, + int clock, int rate); #endif /* __USBAUDIO_CLOCK_H */ |