Commit 1f8e5afd authored by Geyslan G. Bem's avatar Geyslan G. Bem Committed by Greg Kroah-Hartman

usb: host: ehci-dbg: convert macro to inline function

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: default avatarGeyslan G. Bem <geyslan@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e1666317
...@@ -312,23 +312,31 @@ dbg_port_buf(char *buf, unsigned len, const char *label, int port, u32 status) ...@@ -312,23 +312,31 @@ dbg_port_buf(char *buf, unsigned len, const char *label, int port, u32 status)
#endif /* CONFIG_DYNAMIC_DEBUG */ #endif /* CONFIG_DYNAMIC_DEBUG */
/* functions have the "wrong" filename when they're output... */ static inline void
#define dbg_status(ehci, label, status) { \ dbg_status(struct ehci_hcd *ehci, const char *label, u32 status)
char _buf [80]; \ {
dbg_status_buf (_buf, sizeof _buf, label, status); \ char buf[80];
ehci_dbg (ehci, "%s\n", _buf); \
dbg_status_buf(buf, sizeof(buf), label, status);
ehci_dbg(ehci, "%s\n", buf);
} }
#define dbg_cmd(ehci, label, command) { \ static inline void
char _buf [80]; \ dbg_cmd(struct ehci_hcd *ehci, const char *label, u32 command)
dbg_command_buf (_buf, sizeof _buf, label, command); \ {
ehci_dbg (ehci, "%s\n", _buf); \ char buf[80];
dbg_command_buf(buf, sizeof(buf), label, command);
ehci_dbg(ehci, "%s\n", buf);
} }
#define dbg_port(ehci, label, port, status) { \ static inline void
char _buf [80]; \ dbg_port(struct ehci_hcd *ehci, const char *label, int port, u32 status)
dbg_port_buf (_buf, sizeof _buf, label, port, status); \ {
ehci_dbg (ehci, "%s\n", _buf); \ char buf[80];
dbg_port_buf(buf, sizeof(buf), label, port, status);
ehci_dbg(ehci, "%s\n", buf);
} }
/*-------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------*/
...@@ -393,13 +401,19 @@ struct debug_buffer { ...@@ -393,13 +401,19 @@ struct debug_buffer {
size_t alloc_size; size_t alloc_size;
}; };
#define speed_char(info1) ({ char tmp; \ static inline char speed_char(u32 info1)
switch (info1 & (3 << 12)) { \ {
case QH_FULL_SPEED: tmp = 'f'; break; \ switch (info1 & (3 << 12)) {
case QH_LOW_SPEED: tmp = 'l'; break; \ case QH_FULL_SPEED:
case QH_HIGH_SPEED: tmp = 'h'; break; \ return 'f';
default: tmp = '?'; break; \ case QH_LOW_SPEED:
} tmp; }) return 'l';
case QH_HIGH_SPEED:
return 'h';
default:
return '?';
}
}
static inline char token_mark(struct ehci_hcd *ehci, __hc32 token) static inline char token_mark(struct ehci_hcd *ehci, __hc32 token)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment