mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "Geyslan G. Bem" <geyslan@gmail.com>
To: unlisted-recipients:; (no To-header on input)
Cc: "Geyslan G. Bem" <geyslan@gmail.com>,
	linux-kernel@vger.kernel.org,
	Alan Stern <stern@rowland.harvard.edu>,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	linux-usb@vger.kernel.org
Subject: [PATCH 11/17] usb: host: ehci-dbg: convert macro to inline function
Date: Mon,  4 Jan 2016 17:09:56 -0300	[thread overview]
Message-ID: <2b6c1fced86a8bc6fc82ab56ac17cfd6a07f9746.1451937845.git.geyslan@gmail.com> (raw)
In-Reply-To: <cover.1451937845.git.geyslan@gmail.com>
In-Reply-To: <cover.1451937845.git.geyslan@gmail.com>

This patch converts macros into inline functions since the usage of
second is encouraged by Coding Style instead of the first.

Macros converted to functions:
 - dbg_status
 - dbg_cmd
 - dbg_port
 - speed_char

The size after changes remains the same.

Before:
text  data bss dec   hex  filename
36920 81   12  37013 9095 drivers/usb/host/ehci-hcd.o

After:
text  data bss dec   hex  filename
36920 81   12  37013 9095 drivers/usb/host/ehci-hcd.o

Signed-off-by: Geyslan G. Bem <geyslan@gmail.com>
---

Notes:
    The comment
    
    /* functions have the "wrong" filename when they're output... */
    
    was removed because after changes the file remained the same size and
    the symbols of the new inline functions were not created, so they were
    properly inlined.
    
    Tested by compilation only.

 drivers/usb/host/ehci-dbg.c | 54 ++++++++++++++++++++++++++++-----------------
 1 file changed, 34 insertions(+), 20 deletions(-)

diff --git a/drivers/usb/host/ehci-dbg.c b/drivers/usb/host/ehci-dbg.c
index 4ba577d..db28992 100644
--- a/drivers/usb/host/ehci-dbg.c
+++ b/drivers/usb/host/ehci-dbg.c
@@ -317,23 +317,31 @@ dbg_port_buf(char *buf, unsigned len, const char *label, int port, u32 status)
 
 #endif	/* CONFIG_DYNAMIC_DEBUG */
 
-/* functions have the "wrong" filename when they're output... */
-#define dbg_status(ehci, label, status) { \
-	char _buf [80]; \
-	dbg_status_buf (_buf, sizeof _buf, label, status); \
-	ehci_dbg (ehci, "%s\n", _buf); \
+static inline void
+dbg_status(struct ehci_hcd *ehci, const char *label, u32 status)
+{
+	char buf[80];
+
+	dbg_status_buf(buf, sizeof(buf), label, status);
+	ehci_dbg(ehci, "%s\n", buf);
 }
 
-#define dbg_cmd(ehci, label, command) { \
-	char _buf [80]; \
-	dbg_command_buf (_buf, sizeof _buf, label, command); \
-	ehci_dbg (ehci, "%s\n", _buf); \
+static inline void
+dbg_cmd(struct ehci_hcd *ehci, const char *label, u32 command)
+{
+	char buf[80];
+
+	dbg_command_buf(buf, sizeof(buf), label, command);
+	ehci_dbg(ehci, "%s\n", buf);
 }
 
-#define dbg_port(ehci, label, port, status) { \
-	char _buf [80]; \
-	dbg_port_buf (_buf, sizeof _buf, label, port, status); \
-	ehci_dbg (ehci, "%s\n", _buf); \
+static inline void
+dbg_port(struct ehci_hcd *ehci, const char *label, int port, u32 status)
+{
+	char buf[80];
+
+	dbg_port_buf(buf, sizeof(buf), label, port, status);
+	ehci_dbg(ehci, "%s\n", buf);
 }
 
 /*-------------------------------------------------------------------------*/
@@ -403,13 +411,19 @@ struct debug_buffer {
 	size_t alloc_size;
 };
 
-#define speed_char(info1) ({ char tmp; \
-		switch (info1 & (3 << 12)) { \
-		case QH_FULL_SPEED: tmp = 'f'; break; \
-		case QH_LOW_SPEED:  tmp = 'l'; break; \
-		case QH_HIGH_SPEED: tmp = 'h'; break; \
-		default: tmp = '?'; break; \
-		} tmp; })
+static inline char speed_char(u32 info1)
+{
+	switch (info1 & (3 << 12)) {
+	case QH_FULL_SPEED:
+		return 'f';
+	case QH_LOW_SPEED:
+		return 'l';
+	case QH_HIGH_SPEED:
+		return 'h';
+	default:
+		return '?';
+	}
+}
 
 static inline char token_mark(struct ehci_hcd *ehci, __hc32 token)
 {
-- 
2.6.4


  parent reply	other threads:[~2016-01-04 20:16 UTC|newest]

Thread overview: 44+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-01-04 20:09 [PATCH 00/17] usb: host: ehci-dbg: cleanup and refactoring Geyslan G. Bem
2016-01-04 20:09 ` [PATCH 01/17] usb: host: ehci-dbg: remove space before open parenthesis Geyslan G. Bem
2016-01-04 20:09 ` [PATCH 02/17] usb: host: ehci-dbg: remove space before open square bracket Geyslan G. Bem
2016-01-04 20:09 ` [PATCH 03/17] usb: host: ehci-dbg: use C89-style comments Geyslan G. Bem
2016-01-04 20:09 ` [PATCH 04/17] usb: host: ehci-dbg: move trailing statements to next line Geyslan G. Bem
2016-01-04 20:09 ` [PATCH 05/17] usb: host: ehci-dbg: fix up closing parenthesis Geyslan G. Bem
2016-01-04 20:09 ` [PATCH 06/17] usb: host: ehci-dbg: put spaces around operators Geyslan G. Bem
2016-01-04 20:09 ` [PATCH 07/17] usb: host: ehci-dbg: fix unsigned comparison Geyslan G. Bem
2016-01-04 20:50   ` Alan Stern
2016-01-04 21:35     ` Geyslan G. Bem
2016-01-04 21:52       ` Alan Stern
2016-01-04 20:09 ` [PATCH 08/17] usb: host: ehci-dbg: remove unnecessary space after cast Geyslan G. Bem
2016-01-04 20:58   ` Alan Stern
2016-01-04 21:40     ` Geyslan G. Bem
2016-01-04 21:49       ` Greg Kroah-Hartman
2016-01-04 21:52         ` Sergei Shtylyov
2016-01-04 22:07           ` Geyslan G. Bem
2016-01-05  2:40             ` Joe Perches
2016-01-05 15:16               ` Geyslan G. Bem
2016-01-05 16:41               ` Alan Stern
2016-01-04 20:09 ` [PATCH 09/17] usb: host: ehci-dbg: fix up function definitions Geyslan G. Bem
2016-01-04 21:00   ` Alan Stern
2016-01-04 23:28     ` Geyslan G. Bem
2016-01-05 15:12       ` Alan Stern
2016-01-05 15:20         ` Joe Perches
2016-01-05 15:23         ` Joe Perches
2016-01-05 15:27           ` Geyslan G. Bem
2016-01-05 15:36             ` Geyslan G. Bem
2016-01-05 16:06           ` Alan Stern
2016-01-05 16:10             ` Joe Perches
2016-01-05 16:29               ` Alan Stern
2016-01-05 17:03                 ` Geyslan G. Bem
2016-01-04 20:09 ` [PATCH 10/17] usb: host: ehci-dbg: use a blank line after struct declarations Geyslan G. Bem
2016-01-04 20:09 ` Geyslan G. Bem [this message]
2016-01-04 20:09 ` [PATCH 12/17] usb: host: ehci-dbg: add blank line after declarations Geyslan G. Bem
2016-01-04 20:09 ` [PATCH 13/17] usb: host: ehci-dbg: remove blank line before close brace Geyslan G. Bem
2016-01-04 20:09 ` [PATCH 14/17] usb: host: ehci-dbg: replace sizeof operand Geyslan G. Bem
2016-01-04 20:10 ` [PATCH 15/17] usb: host: ehci-dbg: enclose conditional blocks with braces Geyslan G. Bem
2016-01-04 20:10 ` [PATCH 16/17] usb: host: ehci-dbg: prefer kmalloc_array over kmalloc times size Geyslan G. Bem
2016-01-04 20:10 ` [PATCH 17/17] usb: host: ehci-dbg: refactor fill_periodic_buffer function Geyslan G. Bem
2016-01-04 21:01   ` Alan Stern
2016-01-05  1:19     ` Geyslan G. Bem
2016-01-05 15:15       ` Alan Stern
2016-01-05 15:41         ` Geyslan G. Bem

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=2b6c1fced86a8bc6fc82ab56ac17cfd6a07f9746.1451937845.git.geyslan@gmail.com \
    --to=geyslan@gmail.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-usb@vger.kernel.org \
    --cc=stern@rowland.harvard.edu \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®