Skip to contentSkip to conversation

powerpc: pci-ioda: Neatening

PATCH In review Joe Perches 3 participants 5 messages Sep 21, 2014 – Sep 23, 2014 PowerPC

lore
Share & tools
lore

Joe Perches

author
#0 lore raw

cover powerpc: pci-ioda: Neatening

printk calls should return void

Joe Perches (2):
powerpc: pci-ioda: Remove unnecessary return value from printk
powerpc: pci-ioda: Use a single function to emit logging messages

(compiled/untested)

 arch/powerpc/platforms/powernv/pci-ioda.c | 61 +++++++++++++++----------------
 1 file changed, 30 insertions(+), 31 deletions(-)
Signature · 1 line
1.8.1.2.459.gbcd45b4.dirty
author
#1 lore raw

PATCH 1/2 powerpc: pci-ioda: Remove unnecessary return value from printk

The return value is unnecessary and unused, so make the functions void instead of int.

Signed-off-by Joe Perches <[email protected]>
---
 arch/powerpc/platforms/powernv/pci-ioda.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)
arch/powerpc/platforms/powernv/pci-ioda.c +3 -6
index df241b1..16bb93f 100644
@@ -42,12 +42,11 @@
 #include "pci.h"
 
 #define define_pe_printk_level(func, kern_level)		\
-static int func(const struct pnv_ioda_pe *pe, const char *fmt, ...)	\
+static void func(const struct pnv_ioda_pe *pe, const char *fmt, ...)	\
 {								\
 	struct va_format vaf;					\
 	va_list args;						\
 	char pfix[32];						\
-	int r;							\
 								\
 	va_start(args, fmt);					\
 								\

@@ -61,12 +60,10 @@ static int func(const struct pnv_ioda_pe *pe, const char *fmt, ...)	\
 		sprintf(pfix, "%04x:%02x     ",			\
 			pci_domain_nr(pe->pbus),		\
 			pe->pbus->number);			\
-	r = printk(kern_level "pci %s: [PE# %.3d] %pV",		\
-		   pfix, pe->pe_number, &vaf);			\
+	printk(kern_level "pci %s: [PE# %.3d] %pV",		\
+	       pfix, pe->pe_number, &vaf);			\
 								\
 	va_end(args);						\
-								\
-	return r;						\
 }								\
 
 define_pe_printk_level(pe_err, KERN_ERR);
Signature · 1 line
1.8.1.2.459.gbcd45b4.dirty
author
#2 lore raw

PATCH 2/2 powerpc: pci-ioda: Use a single function to emit logging messages

In reply to Joe Perches

No need for 3 functions when a single one will do.

Modify the function declaring macros to call the single function.

Reduces object code size a little:

$ size arch/powerpc/platforms/powernv/pci-ioda.o*
   text	   data	    bss	    dec	    hex	filename
  22303	   1073	   6680	  30056	   7568	arch/powerpc/platforms/powernv/pci-ioda.o.new
  22840	   1121	   6776	  30737	   7811	arch/powerpc/platforms/powernv/pci-ioda.o.old
Signed-off-by Joe Perches <[email protected]>
---
 arch/powerpc/platforms/powernv/pci-ioda.c | 58 ++++++++++++++++---------------
 1 file changed, 30 insertions(+), 28 deletions(-)
arch/powerpc/platforms/powernv/pci-ioda.c +30 -28
index 16bb93f..b0d31083 100644
@@ -41,34 +41,36 @@
 #include "powernv.h"
 #include "pci.h"
 
-#define define_pe_printk_level(func, kern_level)		\
-static void func(const struct pnv_ioda_pe *pe, const char *fmt, ...)	\
-{								\
-	struct va_format vaf;					\
-	va_list args;						\
-	char pfix[32];						\
-								\
-	va_start(args, fmt);					\
-								\
-	vaf.fmt = fmt;						\
-	vaf.va = &args;						\
-								\
-	if (pe->pdev)						\
-		strlcpy(pfix, dev_name(&pe->pdev->dev),		\
-			sizeof(pfix));				\
-	else							\
-		sprintf(pfix, "%04x:%02x     ",			\
-			pci_domain_nr(pe->pbus),		\
-			pe->pbus->number);			\
-	printk(kern_level "pci %s: [PE# %.3d] %pV",		\
-	       pfix, pe->pe_number, &vaf);			\
-								\
-	va_end(args);						\
-}								\
-
-define_pe_printk_level(pe_err, KERN_ERR);
-define_pe_printk_level(pe_warn, KERN_WARNING);
-define_pe_printk_level(pe_info, KERN_INFO);
+static void pe_level_printk(const struct pnv_ioda_pe *pe, const char *level,
+			    const char *fmt, ...)
+{
+	struct va_format vaf;
+	va_list args;
+	char pfix[32];
+
+	va_start(args, fmt);
+
+	vaf.fmt = fmt;
+	vaf.va = &args;
+
+	if (pe->pdev)
+		strlcpy(pfix, dev_name(&pe->pdev->dev), sizeof(pfix));
+	else
+		sprintf(pfix, "%04x:%02x     ",
+			pci_domain_nr(pe->pbus), pe->pbus->number);
+
+	printk("%spci %s: [PE# %.3d] %pV",
+	       level, pfix, pe->pe_number, &vaf);
+
+	va_end(args);
+}
+
+#define pe_err(pe, fmt, ...)					\
+	pe_level_printk(pe, KERN_ERR, fmt, ##__VA_ARGS__)
+#define pe_warn(pe, fmt, ...)					\
+	pe_level_printk(pe, KERN_WARNING, fmt, ##__VA_ARGS__)
+#define pe_info(pe, fmt, ...)					\
+	pe_level_printk(pe, KERN_INFO, fmt, ##__VA_ARGS__)
 
 /*
  * stdcix is only supposed to be used in hypervisor real mode as per
Signature · 1 line
1.8.1.2.459.gbcd45b4.dirty
reviewer
#3 lore raw
In reply to Joe Perches
Quoted 5 lines · Joe Perches

printk calls should return void

Joe Perches (2):
powerpc: pci-ioda: Remove unnecessary return value from printk
powerpc: pci-ioda: Use a single function to emit logging messages

Patches look good to me.

Ben/Gavin, what do these macros give us over pr/dev_debug() ?

cheers

#4 lore raw
Quoted 9 lines · Michael Ellerman
Quoted 5 lines · Joe Perches

printk calls should return void

Joe Perches (2):
powerpc: pci-ioda: Remove unnecessary return value from printk
powerpc: pci-ioda: Use a single function to emit logging messages

Patches look good to me.

Patches look good to me too.

Quoted 2 lines

Ben/Gavin, what do these macros give us over pr/dev_debug() ?

Those macros prints unified mapping information between PE number and PCI device/bus.

Thanks,
Gavin

Quoted 7 lines

cheers

_______________________________________________
Linuxppc-dev mailing list
[email protected]
https://lists.ozlabs.org/listinfo/linuxppc-dev