Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-11 22:51:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

serial: samsung: Neaten dbg uses

Browse Source 
Add format and argument checking and fix misuses in the dbg macro.

Add __printf
Use %pR for resource
Add #include guard to samsung.h
Move static functions from .h to .c
Use vscnprintf instead of length unguarded vsprintf

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Joe Perches 2014-05-20 14:05:50 -07:00 committed by Greg Kroah-Hartman
parent 10389e6623
commit e4ac92df27
2 changed files with 32 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
drivers/tty/serial/samsung.c
View File

@ -53,6 +53,29 @@
#include "samsung.h" #include "samsung.h"
#if defined(CONFIG_SERIAL_SAMSUNG_DEBUG) && \
defined(CONFIG_DEBUG_LL) && \
!defined(MODULE)
extern void printascii(const char *);
__printf(1, 2)
static void dbg(const char *fmt, ...)
{
va_list va;
char buff[256];
va_start(va, fmt);
vscnprintf(buff, sizeof(buf), fmt, va);
va_end(va);
printascii(buff);
}
#else
#define dbg(fmt, ...) do { if (0) no_printk(fmt, ##__VA_ARGS__); } while (0)
#endif
/* UART name and device definitions */ /* UART name and device definitions */
#define S3C24XX_SERIAL_NAME "ttySAC" #define S3C24XX_SERIAL_NAME "ttySAC"
@ -468,8 +491,8 @@ static int s3c24xx_serial_startup(struct uart_port *port)
struct s3c24xx_uart_port *ourport = to_ourport(port); struct s3c24xx_uart_port *ourport = to_ourport(port);
int ret; int ret;
dbg("s3c24xx_serial_startup: port=%p (%08lx,%p)\n", dbg("s3c24xx_serial_startup: port=%p (%08llx,%p)\n",
port->mapbase, port->membase); port, (unsigned long long)port->mapbase, port->membase);
rx_enabled(port) = 1; rx_enabled(port) = 1;
@ -514,8 +537,8 @@ static int s3c64xx_serial_startup(struct uart_port *port)
struct s3c24xx_uart_port *ourport = to_ourport(port); struct s3c24xx_uart_port *ourport = to_ourport(port);
int ret; int ret;
dbg("s3c64xx_serial_startup: port=%p (%08lx,%p)\n", dbg("s3c64xx_serial_startup: port=%p (%08llx,%p)\n",
port->mapbase, port->membase); port, (unsigned long long)port->mapbase, port->membase);
wr_regl(port, S3C64XX_UINTM, 0xf); wr_regl(port, S3C64XX_UINTM, 0xf);
@ -1160,7 +1183,7 @@ static int s3c24xx_serial_init_port(struct s3c24xx_uart_port *ourport,
return -EINVAL; return -EINVAL;
} }
dbg("resource %p (%lx..%lx)\n", res, res->start, res->end); dbg("resource %pR)\n", res);
port->membase = devm_ioremap(port->dev, res->start, resource_size(res)); port->membase = devm_ioremap(port->dev, res->start, resource_size(res));
if (!port->membase) { if (!port->membase) {
@ -1203,7 +1226,7 @@ static int s3c24xx_serial_init_port(struct s3c24xx_uart_port *ourport,
wr_regl(port, S3C64XX_UINTSP, 0xf); wr_regl(port, S3C64XX_UINTSP, 0xf);
} }
dbg("port: map=%08x, mem=%08x, irq=%d (%d,%d), clock=%ld\n", dbg("port: map=%08x, mem=%p, irq=%d (%d,%d), clock=%u\n",
port->mapbase, port->membase, port->irq, port->mapbase, port->membase, port->irq,
ourport->rx_irq, ourport->tx_irq, port->uartclk); ourport->rx_irq, ourport->tx_irq, port->uartclk);

23
drivers/tty/serial/samsung.h
View File

@ -1,3 +1,6 @@
#ifndef __SAMSUNG_H
#define __SAMSUNG_H
/* /*
* Driver for Samsung SoC onboard UARTs. * Driver for Samsung SoC onboard UARTs.
* *
@ -77,24 +80,4 @@ struct s3c24xx_uart_port {
#define wr_regb(port, reg, val) __raw_writeb(val, portaddr(port, reg)) #define wr_regb(port, reg, val) __raw_writeb(val, portaddr(port, reg))
#define wr_regl(port, reg, val) __raw_writel(val, portaddr(port, reg)) #define wr_regl(port, reg, val) __raw_writel(val, portaddr(port, reg))
#if defined(CONFIG_SERIAL_SAMSUNG_DEBUG) && \
defined(CONFIG_DEBUG_LL) && \
!defined(MODULE)
extern void printascii(const char *);
static void dbg(const char *fmt, ...)
{
va_list va;
char buff[256];
va_start(va, fmt);
vsprintf(buff, fmt, va);
va_end(va);
printascii(buff);
}
#else
#define dbg(x...) do { } while (0)
#endif #endif