diff options
author | Kumar Gala <galak@kernel.crashing.org> | 2008-06-12 08:53:48 -0400 |
---|---|---|
committer | Kumar Gala <galak@kernel.crashing.org> | 2008-06-26 02:49:04 -0400 |
commit | 0d8440657ef184907ac5add0b59c771ee8e8a77f (patch) | |
tree | e21ca0d2abc0a23ecfbd992fa2abfa93d65d0399 /drivers/serial/cpm_uart | |
parent | aba11fc50c925bbd6fb25d54eae2f86277a3b107 (diff) |
cpm_uart: fix whitespace issues
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'drivers/serial/cpm_uart')
-rw-r--r-- | drivers/serial/cpm_uart/cpm_uart.h | 8 | ||||
-rw-r--r-- | drivers/serial/cpm_uart/cpm_uart_core.c | 4 | ||||
-rw-r--r-- | drivers/serial/cpm_uart/cpm_uart_cpm1.c | 2 | ||||
-rw-r--r-- | drivers/serial/cpm_uart/cpm_uart_cpm1.h | 2 | ||||
-rw-r--r-- | drivers/serial/cpm_uart/cpm_uart_cpm2.c | 6 | ||||
-rw-r--r-- | drivers/serial/cpm_uart/cpm_uart_cpm2.h | 2 |
6 files changed, 12 insertions, 12 deletions
diff --git a/drivers/serial/cpm_uart/cpm_uart.h b/drivers/serial/cpm_uart/cpm_uart.h index 0cc39f82d7c5..3d07bec06fad 100644 --- a/drivers/serial/cpm_uart/cpm_uart.h +++ b/drivers/serial/cpm_uart/cpm_uart.h | |||
@@ -6,7 +6,7 @@ | |||
6 | * Copyright (C) 2004 Freescale Semiconductor, Inc. | 6 | * Copyright (C) 2004 Freescale Semiconductor, Inc. |
7 | * | 7 | * |
8 | * 2006 (c) MontaVista Software, Inc. | 8 | * 2006 (c) MontaVista Software, Inc. |
9 | * Vitaly Bordug <vbordug@ru.mvista.com> | 9 | * Vitaly Bordug <vbordug@ru.mvista.com> |
10 | * | 10 | * |
11 | * This file is licensed under the terms of the GNU General Public License | 11 | * This file is licensed under the terms of the GNU General Public License |
12 | * version 2. This program is licensed "as is" without any warranty of any | 12 | * version 2. This program is licensed "as is" without any warranty of any |
@@ -28,7 +28,7 @@ | |||
28 | #define SERIAL_CPM_MAJOR 204 | 28 | #define SERIAL_CPM_MAJOR 204 |
29 | #define SERIAL_CPM_MINOR 46 | 29 | #define SERIAL_CPM_MINOR 46 |
30 | 30 | ||
31 | #define IS_SMC(pinfo) (pinfo->flags & FLAG_SMC) | 31 | #define IS_SMC(pinfo) (pinfo->flags & FLAG_SMC) |
32 | #define IS_DISCARDING(pinfo) (pinfo->flags & FLAG_DISCARDING) | 32 | #define IS_DISCARDING(pinfo) (pinfo->flags & FLAG_DISCARDING) |
33 | #define FLAG_DISCARDING 0x00000004 /* when set, don't discard */ | 33 | #define FLAG_DISCARDING 0x00000004 /* when set, don't discard */ |
34 | #define FLAG_SMC 0x00000002 | 34 | #define FLAG_SMC 0x00000002 |
@@ -70,7 +70,7 @@ struct uart_cpm_port { | |||
70 | void (*set_lineif)(struct uart_cpm_port *); | 70 | void (*set_lineif)(struct uart_cpm_port *); |
71 | u8 brg; | 71 | u8 brg; |
72 | uint dp_addr; | 72 | uint dp_addr; |
73 | void *mem_addr; | 73 | void *mem_addr; |
74 | dma_addr_t dma_addr; | 74 | dma_addr_t dma_addr; |
75 | u32 mem_size; | 75 | u32 mem_size; |
76 | /* helpers */ | 76 | /* helpers */ |
@@ -79,7 +79,7 @@ struct uart_cpm_port { | |||
79 | /* Keep track of 'odd' SMC2 wirings */ | 79 | /* Keep track of 'odd' SMC2 wirings */ |
80 | int is_portb; | 80 | int is_portb; |
81 | /* wait on close if needed */ | 81 | /* wait on close if needed */ |
82 | int wait_closing; | 82 | int wait_closing; |
83 | /* value to combine with opcode to form cpm command */ | 83 | /* value to combine with opcode to form cpm command */ |
84 | u32 command; | 84 | u32 command; |
85 | }; | 85 | }; |
diff --git a/drivers/serial/cpm_uart/cpm_uart_core.c b/drivers/serial/cpm_uart/cpm_uart_core.c index a19dc7ef8861..b0104caefa1f 100644 --- a/drivers/serial/cpm_uart/cpm_uart_core.c +++ b/drivers/serial/cpm_uart/cpm_uart_core.c | |||
@@ -13,7 +13,7 @@ | |||
13 | * Copyright (C) 2004, 2007 Freescale Semiconductor, Inc. | 13 | * Copyright (C) 2004, 2007 Freescale Semiconductor, Inc. |
14 | * (C) 2004 Intracom, S.A. | 14 | * (C) 2004 Intracom, S.A. |
15 | * (C) 2005-2006 MontaVista Software, Inc. | 15 | * (C) 2005-2006 MontaVista Software, Inc. |
16 | * Vitaly Bordug <vbordug@ru.mvista.com> | 16 | * Vitaly Bordug <vbordug@ru.mvista.com> |
17 | * | 17 | * |
18 | * This program is free software; you can redistribute it and/or modify | 18 | * This program is free software; you can redistribute it and/or modify |
19 | * it under the terms of the GNU General Public License as published by | 19 | * it under the terms of the GNU General Public License as published by |
@@ -1305,7 +1305,7 @@ static int __init cpm_uart_console_setup(struct console *co, char *options) | |||
1305 | pdata = pdev->dev.platform_data; | 1305 | pdata = pdev->dev.platform_data; |
1306 | if (pdata) | 1306 | if (pdata) |
1307 | if (pdata->init_ioports) | 1307 | if (pdata->init_ioports) |
1308 | pdata->init_ioports(pdata); | 1308 | pdata->init_ioports(pdata); |
1309 | 1309 | ||
1310 | cpm_uart_drv_get_platform_data(pdev, 1); | 1310 | cpm_uart_drv_get_platform_data(pdev, 1); |
1311 | } | 1311 | } |
diff --git a/drivers/serial/cpm_uart/cpm_uart_cpm1.c b/drivers/serial/cpm_uart/cpm_uart_cpm1.c index 74f1432bb248..bec0c974cf54 100644 --- a/drivers/serial/cpm_uart/cpm_uart_cpm1.c +++ b/drivers/serial/cpm_uart/cpm_uart_cpm1.c | |||
@@ -9,7 +9,7 @@ | |||
9 | * Copyright (C) 2004 Freescale Semiconductor, Inc. | 9 | * Copyright (C) 2004 Freescale Semiconductor, Inc. |
10 | * (C) 2004 Intracom, S.A. | 10 | * (C) 2004 Intracom, S.A. |
11 | * (C) 2006 MontaVista Software, Inc. | 11 | * (C) 2006 MontaVista Software, Inc. |
12 | * Vitaly Bordug <vbordug@ru.mvista.com> | 12 | * Vitaly Bordug <vbordug@ru.mvista.com> |
13 | * | 13 | * |
14 | * This program is free software; you can redistribute it and/or modify | 14 | * This program is free software; you can redistribute it and/or modify |
15 | * it under the terms of the GNU General Public License as published by | 15 | * it under the terms of the GNU General Public License as published by |
diff --git a/drivers/serial/cpm_uart/cpm_uart_cpm1.h b/drivers/serial/cpm_uart/cpm_uart_cpm1.h index ddf46d3c964b..b8056980d94f 100644 --- a/drivers/serial/cpm_uart/cpm_uart_cpm1.h +++ b/drivers/serial/cpm_uart/cpm_uart_cpm1.h | |||
@@ -2,7 +2,7 @@ | |||
2 | * linux/drivers/serial/cpm_uart/cpm_uart_cpm1.h | 2 | * linux/drivers/serial/cpm_uart/cpm_uart_cpm1.h |
3 | * | 3 | * |
4 | * Driver for CPM (SCC/SMC) serial ports | 4 | * Driver for CPM (SCC/SMC) serial ports |
5 | * | 5 | * |
6 | * definitions for cpm1 | 6 | * definitions for cpm1 |
7 | * | 7 | * |
8 | */ | 8 | */ |
diff --git a/drivers/serial/cpm_uart/cpm_uart_cpm2.c b/drivers/serial/cpm_uart/cpm_uart_cpm2.c index bb862e2f54cf..e53524c6463c 100644 --- a/drivers/serial/cpm_uart/cpm_uart_cpm2.c +++ b/drivers/serial/cpm_uart/cpm_uart_cpm2.c | |||
@@ -5,11 +5,11 @@ | |||
5 | * | 5 | * |
6 | * Maintainer: Kumar Gala (galak@kernel.crashing.org) (CPM2) | 6 | * Maintainer: Kumar Gala (galak@kernel.crashing.org) (CPM2) |
7 | * Pantelis Antoniou (panto@intracom.gr) (CPM1) | 7 | * Pantelis Antoniou (panto@intracom.gr) (CPM1) |
8 | * | 8 | * |
9 | * Copyright (C) 2004 Freescale Semiconductor, Inc. | 9 | * Copyright (C) 2004 Freescale Semiconductor, Inc. |
10 | * (C) 2004 Intracom, S.A. | 10 | * (C) 2004 Intracom, S.A. |
11 | * (C) 2006 MontaVista Software, Inc. | 11 | * (C) 2006 MontaVista Software, Inc. |
12 | * Vitaly Bordug <vbordug@ru.mvista.com> | 12 | * Vitaly Bordug <vbordug@ru.mvista.com> |
13 | * | 13 | * |
14 | * This program is free software; you can redistribute it and/or modify | 14 | * This program is free software; you can redistribute it and/or modify |
15 | * it under the terms of the GNU General Public License as published by | 15 | * it under the terms of the GNU General Public License as published by |
@@ -273,7 +273,7 @@ void scc4_lineif(struct uart_cpm_port *pinfo) | |||
273 | #endif | 273 | #endif |
274 | 274 | ||
275 | /* | 275 | /* |
276 | * Allocate DP-Ram and memory buffers. We need to allocate a transmit and | 276 | * Allocate DP-Ram and memory buffers. We need to allocate a transmit and |
277 | * receive buffer descriptors from dual port ram, and a character | 277 | * receive buffer descriptors from dual port ram, and a character |
278 | * buffer area from host mem. If we are allocating for the console we need | 278 | * buffer area from host mem. If we are allocating for the console we need |
279 | * to do it from bootmem | 279 | * to do it from bootmem |
diff --git a/drivers/serial/cpm_uart/cpm_uart_cpm2.h b/drivers/serial/cpm_uart/cpm_uart_cpm2.h index 40006a7dce46..a48b56e74841 100644 --- a/drivers/serial/cpm_uart/cpm_uart_cpm2.h +++ b/drivers/serial/cpm_uart/cpm_uart_cpm2.h | |||
@@ -2,7 +2,7 @@ | |||
2 | * linux/drivers/serial/cpm_uart/cpm_uart_cpm2.h | 2 | * linux/drivers/serial/cpm_uart/cpm_uart_cpm2.h |
3 | * | 3 | * |
4 | * Driver for CPM (SCC/SMC) serial ports | 4 | * Driver for CPM (SCC/SMC) serial ports |
5 | * | 5 | * |
6 | * definitions for cpm2 | 6 | * definitions for cpm2 |
7 | * | 7 | * |
8 | */ | 8 | */ |