All of lore.kernel.org
 help / color / mirror / Atom feed
From: Tony Breeds <tony@bakeyournoodle.com>
To: kernel-janitors@vger.kernel.org
Subject: [Kernel-janitors] [PATCH 5/5] remove concatenation with
Date: Sun, 04 Apr 2004 03:16:00 +0000	[thread overview]
Message-ID: <1081048590.173@bakeyournoodle.com> (raw)
In-Reply-To: <20040322052155.GF17221@bakeyournoodle.com>

diff -X dontdiff -purN 2.6.5-rc3.clean/sound/oss/au1000.c 2.6.5-rc3.kj_func/sound/oss/au1000.c
--- 2.6.5-rc3.clean/sound/oss/au1000.c	2004-01-18 17:51:35.000000000 +1100
+++ 2.6.5-rc3.kj_func/sound/oss/au1000.c	2004-04-04 12:39:55.000000000 +1000
@@ -369,7 +369,7 @@ static void set_adc_rate(struct au1000_s
 	adc_rate = rdcodec(s->codec, AC97_PCM_LR_ADC_RATE);
 
 #ifdef AU1000_VERBOSE_DEBUG
-	dbg(__FUNCTION__ ": set to %d Hz", adc_rate);
+	dbg("%s: set to %d Hz", __FUNCTION__, adc_rate);
 #endif
 
 	// some codec's don't allow unequal DAC and ADC rates, in which case
@@ -420,7 +420,7 @@ static void set_dac_rate(struct au1000_s
 	dac_rate = rdcodec(s->codec, AC97_PCM_FRONT_DAC_RATE);
 
 #ifdef AU1000_VERBOSE_DEBUG
-	dbg(__FUNCTION__ ": set to %d Hz", dac_rate);
+	dbg("%s: set to %d Hz", __FUNCTION__, dac_rate);
 #endif
 
 	// some codec's don't allow unequal DAC and ADC rates, in which case
@@ -989,7 +989,7 @@ static int translate_from_user(struct dm
 	for (sample = 0; sample < num_samples; sample++) {
 		if (copy_from_user(usersample, userbuf,
 				   db->user_bytes_per_sample)) {
-			dbg(__FUNCTION__ ": fault");
+			dbg("%s: fault", __FUNCTION__);
 			return -EFAULT;
 		}
 
@@ -1053,7 +1053,7 @@ static int translate_to_user(struct dmab
 
 		if (copy_to_user(userbuf, usersample,
 				 db->user_bytes_per_sample)) {
-			dbg(__FUNCTION__ ": fault");
+			dbg("%s: fault", __FUNCTION__);
 			return -EFAULT;
 		}
 
@@ -1848,9 +1848,9 @@ static int  au1000_open(struct inode *in
 
 #ifdef AU1000_VERBOSE_DEBUG
 	if (file->f_flags & O_NONBLOCK)
-		dbg(__FUNCTION__ ": non-blocking");
+		dbg("%s: non-blocking", __FUNCTION__);
 	else
-		dbg(__FUNCTION__ ": blocking");
+		dbg("%s: blocking", __FUNCTION__);
 #endif
 	
 	file->private_data = s;
diff -X dontdiff -purN 2.6.5-rc3.clean/sound/oss/ite8172.c 2.6.5-rc3.kj_func/sound/oss/ite8172.c
--- 2.6.5-rc3.clean/sound/oss/ite8172.c	2004-01-18 17:51:36.000000000 +1100
+++ 2.6.5-rc3.kj_func/sound/oss/ite8172.c	2004-04-04 12:39:55.000000000 +1000
@@ -1779,9 +1779,9 @@ static int it8172_open(struct inode *ino
     
 #ifdef IT8172_VERBOSE_DEBUG
 	if (file->f_flags & O_NONBLOCK)
-		dbg(__FUNCTION__ ": non-blocking");
+		dbg("%s: non-blocking", __FUNCTION__);
 	else
-		dbg(__FUNCTION__ ": blocking");
+		dbg("%s: blocking", __FUNCTION__);
 #endif
 	
 	for (list = devs.next; ; list = list->next) {
diff -X dontdiff -purN 2.6.5-rc3.clean/sound/oss/rme96xx.c 2.6.5-rc3.kj_func/sound/oss/rme96xx.c
--- 2.6.5-rc3.clean/sound/oss/rme96xx.c	2004-01-18 17:51:36.000000000 +1100
+++ 2.6.5-rc3.kj_func/sound/oss/rme96xx.c	2004-04-04 12:39:55.000000000 +1000
@@ -872,7 +872,7 @@ int rme96xx_init(rme96xx_info* s)
 	int status;
 	unsigned short rev;
 
-	DBG(printk(__FUNCTION__"\n"));
+	DBG(printk("%s\n", __FUNCTION__));
 	numcards++;
 
 	s->magic = RME96xx_MAGIC; 
@@ -972,7 +972,7 @@ static int __devinit rme96xx_probe(struc
 	int i;
 	rme96xx_info *s;
 
-	DBG(printk(__FUNCTION__"\n"));
+	DBG(printk("%s\n", __FUNCTION__));
 	
 	if (pcidev->irq = 0) 
 		return -1;
@@ -1501,7 +1501,7 @@ static int rme96xx_release(struct inode 
 {
 	struct dmabuf * dma = (struct dmabuf*) file->private_data;
 	/* int hwp;  ... was unused   HP20020201 */
-	DBG(printk(__FUNCTION__"\n"));
+	DBG(printk("%s\n", __FUNCTION__));
 
 	COMM          ("draining")
 	if (dma->open_mode & FMODE_WRITE) {
diff -X dontdiff -purN 2.6.5-rc3.clean/sound/oss/vwsnd.c 2.6.5-rc3.kj_func/sound/oss/vwsnd.c
--- 2.6.5-rc3.clean/sound/oss/vwsnd.c	2004-01-18 17:51:36.000000000 +1100
+++ 2.6.5-rc3.kj_func/sound/oss/vwsnd.c	2004-04-04 12:51:19.000000000 +1000
@@ -196,8 +196,8 @@ static void dbgassert(const char *fcn, i
 #define ASSERT(e)      ((e) ? (void) 0 : dbgassert(__FUNCTION__, __LINE__, #e))
 #define DBGDO(x)            x
 #define DBGX(fmt, args...)  (in_interrupt() ? 0 : printk(KERN_ERR fmt, ##args))
-#define DBGP(fmt, args...)  (DBGX(__FUNCTION__ ": " fmt, ##args))
-#define DBGE(fmt, args...)  (DBGX(__FUNCTION__ fmt, ##args))
+#define DBGP(fmt, args...)  (DBGX("%s: " fmt, __FUNCTION__ , ##args))
+#define DBGE(fmt, args...)  (DBGX("%s" fmt, __FUNCTION__ , ##args))
 #define DBGC(rtn)           (DBGP("calling %s\n", rtn))
 #define DBGR()              (DBGP("returning\n"))
 #define DBGXV(fmt, args...) (shut_up ? 0 : DBGX(fmt, ##args))

_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
http://lists.osdl.org/mailman/listinfo/kernel-janitors

  parent reply	other threads:[~2004-04-04  3:16 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2004-03-22  5:35 [Kernel-janitors] [PATCH 2/5] Remove concatenation with Tony Breeds
2004-03-23 18:40 ` Arnd Bergmann
2004-03-27  5:06 ` [Kernel-janitors] [PATCH 0/5] remove " Tony Breeds
2004-03-27  5:11 ` [Kernel-janitors] [PATCH 1/5] " Tony Breeds
2004-03-27  5:12 ` [Kernel-janitors] [PATCH 0/5] " Tony Breeds
2004-03-27  5:12 ` Tony Breeds
2004-03-27  5:13 ` [Kernel-janitors] [PATCH 4/5] " Tony Breeds
2004-03-27  5:17 ` [Kernel-janitors] [PATCH 5/5] " Tony Breeds
2004-04-01 21:55 ` Randy.Dunlap
2004-04-01 22:24 ` Tony Breeds
2004-04-01 23:00 ` Randy.Dunlap
2004-04-02  0:35 ` Randy.Dunlap
2004-04-04  2:20 ` Tony Breeds
2004-04-04  2:28 ` Randy.Dunlap
2004-04-04  3:16 ` [Kernel-janitors] [PATCH 2/5] " Tony Breeds
2004-04-04  3:16 ` [Kernel-janitors] [PATCH 1/5] " Tony Breeds
2004-04-04  3:16 ` [Kernel-janitors] [PATCH 0/5] " Tony Breeds
2004-04-04  3:16 ` Tony Breeds [this message]
2004-04-04  3:16 ` [Kernel-janitors] [PATCH 4/5] " Tony Breeds

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1081048590.173@bakeyournoodle.com \
    --to=tony@bakeyournoodle.com \
    --cc=kernel-janitors@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.