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

Commit a5c95e90 authored by Mark Brown's avatar Mark Brown Committed by Jaroslav Kysela
Browse files

ALSA: ASoC: Replace custom debug macros with pr_ equivalents 



Several ASoC codec drivers use custom macros equivalent to the standard
pr_ macros, most of which are not actually used. Replace these custom
macros with the standard ones.

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarJaroslav Kysela <perex@perex.cz>
parent 796d2ca8

sound/soc/codecs/wm8510.c

+3 −22
Original line number Diff line number Diff line
@@ -30,25 +30,6 @@ 
#define AUDIO_NAME "wm8510"

#define WM8510_VERSION "0.6"



/*

 * Debug

 */



#define WM8510_DEBUG 0



#ifdef WM8510_DEBUG

#define dbg(format, arg...) \

	printk(KERN_DEBUG AUDIO_NAME ": " format "\n" , ## arg)

#else

#define dbg(format, arg...) do {} while (0)

#endif

#define err(format, arg...) \

	printk(KERN_ERR AUDIO_NAME ": " format "\n" , ## arg)

#define info(format, arg...) \

	printk(KERN_INFO AUDIO_NAME ": " format "\n" , ## arg)

#define warn(format, arg...) \

	printk(KERN_WARNING AUDIO_NAME ": " format "\n" , ## arg)



struct snd_soc_codec_device soc_codec_dev_wm8510;



/*
@@ -721,13 +702,13 @@ static int wm8510_codec_probe(struct i2c_adapter *adap, int addr, int kind) 


	ret = i2c_attach_client(i2c);

	if (ret < 0) {

		err("failed to attach codec at addr %x\n", addr);

		pr_err("failed to attach codec at addr %x\n", addr);

		goto err;

	}



	ret = wm8510_init(socdev);

	if (ret < 0) {

		err("failed to initialise WM8510\n");

		pr_err("failed to initialise WM8510\n");

		goto err;

	}

	return ret;
@@ -777,7 +758,7 @@ static int wm8510_probe(struct platform_device *pdev) 
	struct snd_soc_codec *codec;

	int ret = 0;



	info("WM8510 Audio Codec %s", WM8510_VERSION);

	pr_info("WM8510 Audio Codec %s", WM8510_VERSION);



	setup = socdev->codec_data;

	codec = kzalloc(sizeof(struct snd_soc_codec), GFP_KERNEL);

sound/soc/codecs/wm8731.c

+3 −22
Original line number Diff line number Diff line
@@ -31,25 +31,6 @@ 
#define AUDIO_NAME "wm8731"

#define WM8731_VERSION "0.13"



/*

 * Debug

 */



#define WM8731_DEBUG 0



#ifdef WM8731_DEBUG

#define dbg(format, arg...) \

	printk(KERN_DEBUG AUDIO_NAME ": " format "\n" , ## arg)

#else

#define dbg(format, arg...) do {} while (0)

#endif

#define err(format, arg...) \

	printk(KERN_ERR AUDIO_NAME ": " format "\n" , ## arg)

#define info(format, arg...) \

	printk(KERN_INFO AUDIO_NAME ": " format "\n" , ## arg)

#define warn(format, arg...) \

	printk(KERN_WARNING AUDIO_NAME ": " format "\n" , ## arg)



struct snd_soc_codec_device soc_codec_dev_wm8731;



/* codec private data */
@@ -624,13 +605,13 @@ static int wm8731_codec_probe(struct i2c_adapter *adap, int addr, int kind) 


	ret = i2c_attach_client(i2c);

	if (ret < 0) {

		err("failed to attach codec at addr %x\n", addr);

		pr_err("failed to attach codec at addr %x\n", addr);

		goto err;

	}



	ret = wm8731_init(socdev);

	if (ret < 0) {

		err("failed to initialise WM8731\n");

		pr_err("failed to initialise WM8731\n");

		goto err;

	}

	return ret;
@@ -681,7 +662,7 @@ static int wm8731_probe(struct platform_device *pdev) 
	struct wm8731_priv *wm8731;

	int ret = 0;



	info("WM8731 Audio Codec %s", WM8731_VERSION);

	pr_info("WM8731 Audio Codec %s", WM8731_VERSION);



	setup = socdev->codec_data;

	codec = kzalloc(sizeof(struct snd_soc_codec), GFP_KERNEL);

sound/soc/codecs/wm8750.c

+3 −22
Original line number Diff line number Diff line
@@ -31,25 +31,6 @@ 
#define AUDIO_NAME "WM8750"

#define WM8750_VERSION "0.12"



/*

 * Debug

 */



#define WM8750_DEBUG 0



#ifdef WM8750_DEBUG

#define dbg(format, arg...) \

	printk(KERN_DEBUG AUDIO_NAME ": " format "\n" , ## arg)

#else

#define dbg(format, arg...) do {} while (0)

#endif

#define err(format, arg...) \

	printk(KERN_ERR AUDIO_NAME ": " format "\n" , ## arg)

#define info(format, arg...) \

	printk(KERN_INFO AUDIO_NAME ": " format "\n" , ## arg)

#define warn(format, arg...) \

	printk(KERN_WARNING AUDIO_NAME ": " format "\n" , ## arg)



/* codec private data */

struct wm8750_priv {

	unsigned int sysclk;
@@ -896,13 +877,13 @@ static int wm8750_codec_probe(struct i2c_adapter *adap, int addr, int kind) 


	ret = i2c_attach_client(i2c);

	if (ret < 0) {

		err("failed to attach codec at addr %x\n", addr);

		pr_err("failed to attach codec at addr %x\n", addr);

		goto err;

	}



	ret = wm8750_init(socdev);

	if (ret < 0) {

	err("failed to initialise WM8750\n");

		pr_err("failed to initialise WM8750\n");

		goto err;

	}

	return ret;
@@ -953,7 +934,7 @@ static int wm8750_probe(struct platform_device *pdev) 
	struct wm8750_priv *wm8750;

	int ret = 0;



	info("WM8750 Audio Codec %s", WM8750_VERSION);

	pr_info("WM8750 Audio Codec %s", WM8750_VERSION);

	codec = kzalloc(sizeof(struct snd_soc_codec), GFP_KERNEL);

	if (codec == NULL)

		return -ENOMEM;

sound/soc/codecs/wm8753.c

+3 −22
Original line number Diff line number Diff line
@@ -55,25 +55,6 @@ 
#define AUDIO_NAME "wm8753"

#define WM8753_VERSION "0.16"



/*

 * Debug

 */



#define WM8753_DEBUG 0



#ifdef WM8753_DEBUG

#define dbg(format, arg...) \

	printk(KERN_DEBUG AUDIO_NAME ": " format "\n" , ## arg)

#else

#define dbg(format, arg...) do {} while (0)

#endif

#define err(format, arg...) \

	printk(KERN_ERR AUDIO_NAME ": " format "\n" , ## arg)

#define info(format, arg...) \

	printk(KERN_INFO AUDIO_NAME ": " format "\n" , ## arg)

#define warn(format, arg...) \

	printk(KERN_WARNING AUDIO_NAME ": " format "\n" , ## arg)



static int caps_charge = 2000;

module_param(caps_charge, int, 0);

MODULE_PARM_DESC(caps_charge, "WM8753 cap charge time (msecs)");
@@ -1689,13 +1670,13 @@ static int wm8753_codec_probe(struct i2c_adapter *adap, int addr, int kind) 


	ret = i2c_attach_client(i2c);

	if (ret < 0) {

		err("failed to attach codec at addr %x\n", addr);

		pr_err("failed to attach codec at addr %x\n", addr);

		goto err;

	}



	ret = wm8753_init(socdev);

	if (ret < 0) {

		err("failed to initialise WM8753\n");

		pr_err("failed to initialise WM8753\n");

		goto err;

	}
@@ -1747,7 +1728,7 @@ static int wm8753_probe(struct platform_device *pdev) 
	struct wm8753_priv *wm8753;

	int ret = 0;



	info("WM8753 Audio Codec %s", WM8753_VERSION);

	pr_info("WM8753 Audio Codec %s", WM8753_VERSION);



	setup = socdev->codec_data;

	codec = kzalloc(sizeof(struct snd_soc_codec), GFP_KERNEL);

sound/soc/codecs/wm8990.c

+3 −22
Original line number Diff line number Diff line
@@ -33,25 +33,6 @@ 
#define AUDIO_NAME "wm8990"

#define WM8990_VERSION "0.2"



/*

 * Debug

 */



#define WM8990_DEBUG 0



#ifdef WM8990_DEBUG

#define dbg(format, arg...) \

	printk(KERN_DEBUG AUDIO_NAME ": " format "\n" , ## arg)

#else

#define dbg(format, arg...) do {} while (0)

#endif

#define err(format, arg...) \

	printk(KERN_ERR AUDIO_NAME ": " format "\n" , ## arg)

#define info(format, arg...) \

	printk(KERN_INFO AUDIO_NAME ": " format "\n" , ## arg)

#define warn(format, arg...) \

	printk(KERN_WARNING AUDIO_NAME ": " format "\n" , ## arg)



/* codec private data */

struct wm8990_priv {

	unsigned int sysclk;
@@ -1524,13 +1505,13 @@ static int wm8990_codec_probe(struct i2c_adapter *adap, int addr, int kind) 


	ret = i2c_attach_client(i2c);

	if (ret < 0) {

		err("failed to attach codec at addr %x\n", addr);

		pr_err("failed to attach codec at addr %x\n", addr);

		goto err;

	}



	ret = wm8990_init(socdev);

	if (ret < 0) {

		err("failed to initialise WM8990\n");

		pr_err("failed to initialise WM8990\n");

		goto err;

	}

	return ret;
@@ -1579,7 +1560,7 @@ static int wm8990_probe(struct platform_device *pdev) 
	struct wm8990_priv *wm8990;

	int ret = 0;



	info("WM8990 Audio Codec %s\n", WM8990_VERSION);

	pr_info("WM8990 Audio Codec %s\n", WM8990_VERSION);



	setup = socdev->codec_data;

	codec = kzalloc(sizeof(struct snd_soc_codec), GFP_KERNEL);