Skip to content

Commit

Permalink
tty: ar933x_uart: use config_enabled() macro to clean up ifdefs
Browse files Browse the repository at this point in the history
Add a new ar933x_uart_console_enabled() helper function
which uses the config_enable(CONFIG_SERIAL_AR933X_CONSOLE)
macro to decide if the console support is enabled or not.

Remove the 'ifdef CONFIG_SERIAL_AR933X_CONSOLE' statements
and use the new helper function to conditionally enable
console support instead.

If CONFIG_SERIAL_AR933X_CONSOLE is not enabled, the new
helper function will become a null stub which allows the
compiler to optimize out the unused console specific
functions/variables.

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Gabor Juhos authored and Greg Kroah-Hartman committed Aug 28, 2013
1 parent 0710e56 commit 1241553
Showing 1 changed file with 12 additions and 13 deletions.
25 changes: 12 additions & 13 deletions drivers/tty/serial/ar933x_uart.c
Original file line number Diff line number Diff line change
@@ -50,6 +50,11 @@ struct ar933x_uart_port {
struct clk *clk;
};

static inline bool ar933x_uart_console_enabled(void)
{
return config_enabled(CONFIG_SERIAL_AR933X_CONSOLE);
}

static inline unsigned int ar933x_uart_read(struct ar933x_uart_port *up,
int offset)
{
@@ -500,8 +505,6 @@ static struct uart_ops ar933x_uart_ops = {
.verify_port = ar933x_uart_verify_port,
};

#ifdef CONFIG_SERIAL_AR933X_CONSOLE

static struct ar933x_uart_port *
ar933x_console_ports[CONFIG_SERIAL_AR933X_NR_UARTS];

@@ -600,25 +603,18 @@ static struct console ar933x_uart_console = {

static void ar933x_uart_add_console_port(struct ar933x_uart_port *up)
{
if (!ar933x_uart_console_enabled())
return;

ar933x_console_ports[up->port.line] = up;
}

#define AR933X_SERIAL_CONSOLE (&ar933x_uart_console)

#else

static inline void ar933x_uart_add_console_port(struct ar933x_uart_port *up) {}

#define AR933X_SERIAL_CONSOLE NULL

#endif /* CONFIG_SERIAL_AR933X_CONSOLE */

static struct uart_driver ar933x_uart_driver = {
.owner = THIS_MODULE,
.driver_name = DRIVER_NAME,
.dev_name = "ttyATH",
.nr = CONFIG_SERIAL_AR933X_NR_UARTS,
.cons = AR933X_SERIAL_CONSOLE,
.cons = NULL, /* filled in runtime */
};

static int ar933x_uart_probe(struct platform_device *pdev)
@@ -730,6 +726,9 @@ static int __init ar933x_uart_init(void)
{
int ret;

if (ar933x_uart_console_enabled())
ar933x_uart_driver.cons = &ar933x_uart_console;

ret = uart_register_driver(&ar933x_uart_driver);
if (ret)
goto err_out;

0 comments on commit 1241553

Please sign in to comment.