Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-15 12:27:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ARM: Merge next-samsung-serial1

Browse Source 
Merge branch 'next-samsung-serial1' into next-samsung-try7
This commit is contained in:
Ben Dooks 2010-01-19 18:36:16 +09:00
commit 9717453c40
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/serial/samsung.c
View File

@ -1374,7 +1374,7 @@ s3c24xx_serial_get_options(struct uart_port *port, int *baud,
* data. * data.
*/ */
static int s3c24xx_serial_init_ports(struct s3c24xx_uart_info *info) static int s3c24xx_serial_init_ports(struct s3c24xx_uart_info **info)
{ {
struct s3c24xx_uart_port *ptr = s3c24xx_serial_ports; struct s3c24xx_uart_port *ptr = s3c24xx_serial_ports;
struct platform_device **platdev_ptr; struct platform_device **platdev_ptr;
@ -1385,7 +1385,7 @@ static int s3c24xx_serial_init_ports(struct s3c24xx_uart_info *info)
platdev_ptr = s3c24xx_uart_devs; platdev_ptr = s3c24xx_uart_devs;
for (i = 0; i < CONFIG_SERIAL_SAMSUNG_UARTS; i++, ptr++, platdev_ptr++) { for (i = 0; i < CONFIG_SERIAL_SAMSUNG_UARTS; i++, ptr++, platdev_ptr++) {
s3c24xx_serial_init_port(ptr, info, *platdev_ptr); s3c24xx_serial_init_port(ptr, info[i], *platdev_ptr);
} }
return 0; return 0;
@ -1451,7 +1451,7 @@ static struct console s3c24xx_serial_console = {
}; };
int s3c24xx_serial_initconsole(struct platform_driver *drv, int s3c24xx_serial_initconsole(struct platform_driver *drv,
struct s3c24xx_uart_info *info) struct s3c24xx_uart_info **info)
{ {
struct platform_device *dev = s3c24xx_uart_devs[0]; struct platform_device *dev = s3c24xx_uart_devs[0];

19
drivers/serial/samsung.h
View File

@ -75,19 +75,24 @@ extern int s3c24xx_serial_probe(struct platform_device *dev,
extern int __devexit s3c24xx_serial_remove(struct platform_device *dev); extern int __devexit s3c24xx_serial_remove(struct platform_device *dev);
extern int s3c24xx_serial_initconsole(struct platform_driver *drv, extern int s3c24xx_serial_initconsole(struct platform_driver *drv,
struct s3c24xx_uart_info *uart); struct s3c24xx_uart_info **uart);
extern int s3c24xx_serial_init(struct platform_driver *drv, extern int s3c24xx_serial_init(struct platform_driver *drv,
struct s3c24xx_uart_info *info); struct s3c24xx_uart_info *info);
#ifdef CONFIG_SERIAL_SAMSUNG_CONSOLE #ifdef CONFIG_SERIAL_SAMSUNG_CONSOLE
#define s3c24xx_console_init(__drv, __inf) \ #define s3c24xx_console_init(__drv, __inf) \
static int __init s3c_serial_console_init(void) \ static int __init s3c_serial_console_init(void) \
{ \ { \
return s3c24xx_serial_initconsole(__drv, __inf); \ struct s3c24xx_uart_info *uinfo[CONFIG_SERIAL_SAMSUNG_UARTS]; \
} \ int i; \
\ \
for (i = 0; i < CONFIG_SERIAL_SAMSUNG_UARTS; i++) \
uinfo[i] = __inf; \
return s3c24xx_serial_initconsole(__drv, uinfo); \
} \
\
console_initcall(s3c_serial_console_init) console_initcall(s3c_serial_console_init)
#else #else