Commit 7ec827b9 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: usb-audio: Drop debug.h 



The file debug.h contains a simple macro for debug prints, and it's
used only in two places, the format parser and the hw_params rules.
The former actually should print a more informative message instead,
so the only users are the hw_parmas rules.

This patch moves the contents of debug.h into the hw_params rules
local code and remove the unneeded includes.  Also, the debug print in
the format parser is replaced with the information print with more
useful information, and the raw printk() call is replaced with
pr_debug().

Tested-by: default avatarKeith Milner <kamilner@superlative.org>
Tested-by: default avatarDylan Robinson <dylan_robinson@motu.com>
Link: https://lore.kernel.org/r/20201123085347.19667-13-tiwai@suse.de


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 7726dce1

sound/usb/card.c

+0 −1
Original line number Diff line number Diff line
@@ -49,7 +49,6 @@ 
#include "quirks.h"

#include "endpoint.h"

#include "helper.h"

#include "debug.h"

#include "pcm.h"

#include "format.h"

#include "power.h"

sound/usb/debug.h

deleted100644 → 0
+0 −16
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef __USBAUDIO_DEBUG_H

#define __USBAUDIO_DEBUG_H



/*

 * h/w constraints

 */



#ifdef HW_CONST_DEBUG

#define hwc_debug(fmt, args...) printk(KERN_DEBUG fmt, ##args)

#else

#define hwc_debug(fmt, args...) do { } while(0)

#endif



#endif /* __USBAUDIO_DEBUG_H */

sound/usb/format.c

+3 −2
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 
#include "card.h"

#include "quirks.h"

#include "helper.h"

#include "debug.h"

#include "clock.h"

#include "format.h"
@@ -227,7 +226,9 @@ static int parse_audio_format_rates_v1(struct snd_usb_audio *chip, struct audiof 
			fp->nr_rates++;

		}

		if (!fp->nr_rates) {

			hwc_debug("All rates were zero. Skipping format!\n");

			usb_audio_info(chip,

				       "%u:%d: All rates were zero\n",

				       fp->iface, fp->altsetting);

			return -EINVAL;

		}

	} else {

sound/usb/pcm.c

+10 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
#include "usbaudio.h"

#include "card.h"

#include "quirks.h"

#include "debug.h"

#include "endpoint.h"

#include "helper.h"

#include "pcm.h"
@@ -1061,6 +1060,16 @@ static int snd_usb_pcm_prepare(struct snd_pcm_substream *substream) 
	return ret;

}



/*

 * h/w constraints

 */



#ifdef HW_CONST_DEBUG

#define hwc_debug(fmt, args...) pr_debug(fmt, ##args)

#else

#define hwc_debug(fmt, args...) do { } while(0)

#endif



static const struct snd_pcm_hardware snd_usb_hardware =

{

	.info =			SNDRV_PCM_INFO_MMAP |