Merge branch 'topic/dummy' into for-linus
* topic/dummy: ALSA: dummy - Increase MAX_PCM_SUBSTREAMS to 128 ALSA: dummy - Add debug proc file ALSA: Add const prefix to proc helper functions ALSA: Re-export snd_pcm_format_name() function ALSA: dummy - Fake buffer allocations ALSA: dummy - Fix the timer calculation in systimer mode ALSA: dummy - Add more description ALSA: dummy - Better jiffies handling ALSA: dummy - Support high-res timer mode
This commit is contained in:
@@ -106,7 +106,7 @@ static int resize_info_buffer(struct snd_info_buffer *buffer,
|
||||
*
|
||||
* Returns the size of output string.
|
||||
*/
|
||||
int snd_iprintf(struct snd_info_buffer *buffer, char *fmt,...)
|
||||
int snd_iprintf(struct snd_info_buffer *buffer, const char *fmt, ...)
|
||||
{
|
||||
va_list args;
|
||||
int len, res;
|
||||
@@ -725,7 +725,7 @@ EXPORT_SYMBOL(snd_info_get_line);
|
||||
* Returns the updated pointer of the original string so that
|
||||
* it can be used for the next call.
|
||||
*/
|
||||
char *snd_info_get_str(char *dest, char *src, int len)
|
||||
const char *snd_info_get_str(char *dest, const char *src, int len)
|
||||
{
|
||||
int c;
|
||||
|
||||
|
Reference in New Issue
Block a user