}
 }
 
-static inline struct s3c24xx_uart_info *s3c24xx_port_to_info(struct uart_port *port)
+static inline struct s3c24xx_uart_info
+       *s3c24xx_port_to_info(struct uart_port *port)
 {
        return to_ourport(port)->info;
 }
 
-static inline struct s3c2410_uartcfg *s3c24xx_port_to_cfg(struct uart_port *port)
+static inline struct s3c2410_uartcfg
+       *s3c24xx_port_to_cfg(struct uart_port *port)
 {
        struct s3c24xx_uart_port *ourport;
 
                uart_insert_char(port, uerstat, S3C2410_UERSTAT_OVERRUN,
                                 ch, flag);
 
- ignore_char:
+ignore_char:
                continue;
        }
 
        spin_unlock_irqrestore(&port->lock, flags);
        tty_flip_buffer_push(&port->state->port);
 
- out:
+out:
        return IRQ_HANDLED;
 }
 
        if (uart_circ_empty(xmit))
                s3c24xx_serial_stop_tx(port);
 
- out:
+out:
        spin_unlock_irqrestore(&port->lock, flags);
        return IRQ_HANDLED;
 }
 
        return ret;
 
- err:
+err:
        s3c24xx_serial_shutdown(port);
        return ret;
 }
         */
        port->read_status_mask = S3C2410_UERSTAT_OVERRUN;
        if (termios->c_iflag & INPCK)
-               port->read_status_mask |= S3C2410_UERSTAT_FRAME | S3C2410_UERSTAT_PARITY;
-
+               port->read_status_mask |= S3C2410_UERSTAT_FRAME |
+                       S3C2410_UERSTAT_PARITY;
        /*
         * Which character status flags should we ignore?
         */
        .minor          = S3C24XX_SERIAL_MINOR,
 };
 
-static struct s3c24xx_uart_port s3c24xx_serial_ports[CONFIG_SERIAL_SAMSUNG_UARTS] = {
+#define __PORT_LOCK_UNLOCKED(i) \
+       __SPIN_LOCK_UNLOCKED(s3c24xx_serial_ports[i].port.lock)
+static struct s3c24xx_uart_port
+s3c24xx_serial_ports[CONFIG_SERIAL_SAMSUNG_UARTS] = {
        [0] = {
                .port = {
-                       .lock           = __SPIN_LOCK_UNLOCKED(s3c24xx_serial_ports[0].port.lock),
+                       .lock           = __PORT_LOCK_UNLOCKED(0),
                        .iotype         = UPIO_MEM,
                        .uartclk        = 0,
                        .fifosize       = 16,
        },
        [1] = {
                .port = {
-                       .lock           = __SPIN_LOCK_UNLOCKED(s3c24xx_serial_ports[1].port.lock),
+                       .lock           = __PORT_LOCK_UNLOCKED(1),
                        .iotype         = UPIO_MEM,
                        .uartclk        = 0,
                        .fifosize       = 16,
 
        [2] = {
                .port = {
-                       .lock           = __SPIN_LOCK_UNLOCKED(s3c24xx_serial_ports[2].port.lock),
+                       .lock           = __PORT_LOCK_UNLOCKED(2),
                        .iotype         = UPIO_MEM,
                        .uartclk        = 0,
                        .fifosize       = 16,
 #if CONFIG_SERIAL_SAMSUNG_UARTS > 3
        [3] = {
                .port = {
-                       .lock           = __SPIN_LOCK_UNLOCKED(s3c24xx_serial_ports[3].port.lock),
+                       .lock           = __PORT_LOCK_UNLOCKED(3),
                        .iotype         = UPIO_MEM,
                        .uartclk        = 0,
                        .fifosize       = 16,
        }
 #endif
 };
+#undef __PORT_LOCK_UNLOCKED
 
 /* s3c24xx_serial_resetport
  *
                s3c24xx_serial_set_termios(uport, termios, NULL);
        }
 
- exit:
+exit:
        return 0;
 }
 
-static inline int s3c24xx_serial_cpufreq_register(struct s3c24xx_uart_port *port)
+static inline int
+s3c24xx_serial_cpufreq_register(struct s3c24xx_uart_port *port)
 {
        port->freq_transition.notifier_call = s3c24xx_serial_cpufreq_transition;
 
                                         CPUFREQ_TRANSITION_NOTIFIER);
 }
 
-static inline void s3c24xx_serial_cpufreq_deregister(struct s3c24xx_uart_port *port)
+static inline void
+s3c24xx_serial_cpufreq_deregister(struct s3c24xx_uart_port *port)
 {
        cpufreq_unregister_notifier(&port->freq_transition,
                                    CPUFREQ_TRANSITION_NOTIFIER);
 }
 
 #else
-static inline int s3c24xx_serial_cpufreq_register(struct s3c24xx_uart_port *port)
+static inline int
+s3c24xx_serial_cpufreq_register(struct s3c24xx_uart_port *port)
 {
        return 0;
 }
 
-static inline void s3c24xx_serial_cpufreq_deregister(struct s3c24xx_uart_port *port)
+static inline void
+s3c24xx_serial_cpufreq_deregister(struct s3c24xx_uart_port *port)
 {
 }
 #endif