Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3af5d052 authored by Joe Perches's avatar Joe Perches Committed by Takashi Iwai
Browse files

sound/oss: Remove uncompilable DBG macro use 



Most of it duplicates function tracing and one
of them has an uncompilable printf %P use.
Others have format/argument mismatches.

Remove unused DBG1 macro definition

Neaten uart401.c use of ok test around this
DBG macro removal.

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 6ea0cae7

sound/oss/ad1848.c

+0 −4
Original line number Diff line number Diff line
@@ -50,8 +50,6 @@ 
#include <linux/pnp.h>

#include <linux/spinlock.h>



#define DEB(x)

#define DEB1(x)

#include "sound_config.h"



#include "ad1848.h"
@@ -1016,8 +1014,6 @@ static void ad1848_close(int dev) 
	ad1848_info    *devc = (ad1848_info *) audio_devs[dev]->devc;

	ad1848_port_info *portc = (ad1848_port_info *) audio_devs[dev]->portc;



	DEB(printk("ad1848_close(void)\n"));



	devc->intr_active = 0;

	ad1848_halt(dev);

sound/oss/opl3.c

+0 −3
Original line number Diff line number Diff line
@@ -275,7 +275,6 @@ static int opl3_kill_note (int devno, int voice, int note, int velocity) 
	 devc->v_alloc->map[voice] = 0;



	 map = &pv_map[devc->lv_map[voice]];

	 DEB(printk("Kill note %d\n", voice));



	 if (map->voice_mode == 0)

		 return 0;
@@ -873,8 +872,6 @@ static void opl3_aftertouch(int dev, int voice, int pressure) 


	map = &pv_map[devc->lv_map[voice]];



	DEB(printk("Aftertouch %d\n", voice));



	if (map->voice_mode == 0)

		return;

sound/oss/pas2_mixer.c

+0 −9
Original line number Diff line number Diff line
@@ -21,10 +21,6 @@ 


#include "pas2.h"



#ifndef DEB

#define DEB(what)		/* (what) */

#endif



extern int      pas_translate_code;

extern char     pas_model;

extern int     *pas_osp;
@@ -120,8 +116,6 @@ pas_mixer_set(int whichDev, unsigned int level) 
{

	int             left, right, devmask, changed, i, mixer = 0;



	DEB(printk("static int pas_mixer_set(int whichDev = %d, unsigned int level = %X)\n", whichDev, level));



	left = level & 0x7f;

	right = (level & 0x7f00) >> 8;
@@ -207,8 +201,6 @@ pas_mixer_reset(void) 
{

	int             foo;



	DEB(printk("pas2_mixer.c: void pas_mixer_reset(void)\n"));



	for (foo = 0; foo < SOUND_MIXER_NRDEVICES; foo++)

		pas_mixer_set(foo, levels[foo]);
@@ -220,7 +212,6 @@ static int pas_mixer_ioctl(int dev, unsigned int cmd, void __user *arg) 
	int level,v ;

	int __user *p = (int __user *)arg;



	DEB(printk("pas2_mixer.c: int pas_mixer_ioctl(unsigned int cmd = %X, unsigned int arg = %X)\n", cmd, arg));

	if (cmd == SOUND_MIXER_PRIVATE1) { /* Set loudness bit */

		if (get_user(level, p))

			return -EFAULT;

sound/oss/pas2_pcm.c

+0 −18
Original line number Diff line number Diff line
@@ -22,10 +22,6 @@ 


#include "pas2.h"



#ifndef DEB

#define DEB(WHAT)

#endif



#define PAS_PCM_INTRBITS (0x08)

/*

 * Sample buffer timer interrupt enable
@@ -156,8 +152,6 @@ static int pas_audio_ioctl(int dev, unsigned int cmd, void __user *arg) 
	int val, ret;

	int __user *p = arg;



	DEB(printk("pas2_pcm.c: static int pas_audio_ioctl(unsigned int cmd = %X, unsigned int arg = %X)\n", cmd, arg));



	switch (cmd) 

	{

	case SOUND_PCM_WRITE_RATE:
@@ -204,8 +198,6 @@ static int pas_audio_ioctl(int dev, unsigned int cmd, void __user *arg) 


static void pas_audio_reset(int dev)

{

	DEB(printk("pas2_pcm.c: static void pas_audio_reset(void)\n"));



	pas_write(pas_read(0xF8A) & ~0x40, 0xF8A);	/* Disable PCM */

}
@@ -214,8 +206,6 @@ static int pas_audio_open(int dev, int mode) 
	int             err;

	unsigned long   flags;



	DEB(printk("pas2_pcm.c: static int pas_audio_open(int mode = %X)\n", mode));



	spin_lock_irqsave(&pas_lock, flags);

	if (pcm_busy)

	{
@@ -239,8 +229,6 @@ static void pas_audio_close(int dev) 
{

	unsigned long   flags;



	DEB(printk("pas2_pcm.c: static void pas_audio_close(void)\n"));



	spin_lock_irqsave(&pas_lock, flags);



	pas_audio_reset(dev);
@@ -256,8 +244,6 @@ static void pas_audio_output_block(int dev, unsigned long buf, int count, 
{

	unsigned long   flags, cnt;



	DEB(printk("pas2_pcm.c: static void pas_audio_output_block(char *buf = %P, int count = %X)\n", buf, count));



	cnt = count;

	if (audio_devs[dev]->dmap_out->dma > 3)

		cnt >>= 1;
@@ -303,8 +289,6 @@ static void pas_audio_start_input(int dev, unsigned long buf, int count, 
	unsigned long   flags;

	int             cnt;



	DEB(printk("pas2_pcm.c: static void pas_audio_start_input(char *buf = %P, int count = %X)\n", buf, count));



	cnt = count;

	if (audio_devs[dev]->dmap_out->dma > 3)

		cnt >>= 1;
@@ -388,8 +372,6 @@ static struct audio_driver pas_audio_driver = 


void __init pas_pcm_init(struct address_info *hw_config)

{

	DEB(printk("pas2_pcm.c: long pas_pcm_init()\n"));



	pcm_bitsok = 8;

	if (pas_read(0xEF8B) & 0x08)

		pcm_bitsok |= 16;

sound/oss/sb_common.c

+0 −4
Original line number Diff line number Diff line
@@ -226,8 +226,6 @@ int sb_dsp_reset(sb_devc * devc) 
{

	int loopc;



	DEB(printk("Entered sb_dsp_reset()\n"));



	if (devc->model == MDL_ESS) return ess_dsp_reset (devc);



	/* This is only for non-ESS chips */
@@ -246,8 +244,6 @@ int sb_dsp_reset(sb_devc * devc) 
		return 0;	/* Sorry */

	}



	DEB(printk("sb_dsp_reset() OK\n"));



	return 1;

}