diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-11 17:08:47 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-11 17:08:47 -0500 |
commit | c6bd5bcc4983f1a2d2f87a3769bf309482ee8c04 (patch) | |
tree | 2ff9c4496dc2258d601a1bcd82040470704dae3b /drivers/tty/serial/atmel_serial.c | |
parent | 8966961b31c251b854169e9886394c2a20f2cea7 (diff) | |
parent | b0ab02361167faa82198b783a8d555eb6f58901c (diff) |
Merge tag 'tty-3.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
Pull TTY/Serial merge from Greg Kroah-Hartman:
"Here's the big tty/serial tree set of changes for 3.8-rc1.
Contained in here is a bunch more reworks of the tty port layer from
Jiri and bugfixes from Alan, along with a number of other tty and
serial driver updates by the various driver authors.
Also, Jiri has been coerced^Wconvinced to be the co-maintainer of the
TTY layer, which is much appreciated by me.
All of these have been in the linux-next tree for a while.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"
Fixed up some trivial conflicts in the staging tree, due to the fwserial
driver having come in both ways (but fixed up a bit in the serial tree),
and the ioctl handling in the dgrp driver having been done slightly
differently (staging tree got that one right, and removed both
TIOCGSOFTCAR and TIOCSSOFTCAR).
* tag 'tty-3.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (146 commits)
staging: sb105x: fix potential NULL pointer dereference in mp_chars_in_buffer()
staging/fwserial: Remove superfluous free
staging/fwserial: Use WARN_ONCE when port table is corrupted
staging/fwserial: Destruct embedded tty_port on teardown
staging/fwserial: Fix build breakage when !CONFIG_BUG
staging: fwserial: Add TTY-over-Firewire serial driver
drivers/tty/serial/serial_core.c: clean up HIGH_BITS_OFFSET usage
staging: dgrp: dgrp_tty.c: Audit the return values of get/put_user()
staging: dgrp: dgrp_tty.c: Remove the TIOCSSOFTCAR ioctl handler from dgrp driver
serial: ifx6x60: Add modem power off function in the platform reboot process
serial: mxs-auart: unmap the scatter list before we copy the data
serial: mxs-auart: disable the Receive Timeout Interrupt when DMA is enabled
serial: max310x: Setup missing "can_sleep" field for GPIO
tty/serial: fix ifx6x60.c declaration warning
serial: samsung: add devicetree properties for non-Exynos SoCs
serial: samsung: fix potential soft lockup during uart write
tty: vt: Remove redundant null check before kfree.
tty/8250 Add check for pci_ioremap_bar failure
tty/8250 Add support for Commtech's Fastcom Async-335 and Fastcom Async-PCIe cards
tty/8250 Add XR17D15x devices to the exar_handle_irq override
...
Diffstat (limited to 'drivers/tty/serial/atmel_serial.c')
-rw-r--r-- | drivers/tty/serial/atmel_serial.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/tty/serial/atmel_serial.c b/drivers/tty/serial/atmel_serial.c index 65f891be12d1..b95886c1198d 100644 --- a/drivers/tty/serial/atmel_serial.c +++ b/drivers/tty/serial/atmel_serial.c | |||
@@ -1424,7 +1424,7 @@ static struct uart_ops atmel_pops = { | |||
1424 | #endif | 1424 | #endif |
1425 | }; | 1425 | }; |
1426 | 1426 | ||
1427 | static void __devinit atmel_of_init_port(struct atmel_uart_port *atmel_port, | 1427 | static void atmel_of_init_port(struct atmel_uart_port *atmel_port, |
1428 | struct device_node *np) | 1428 | struct device_node *np) |
1429 | { | 1429 | { |
1430 | u32 rs485_delay[2]; | 1430 | u32 rs485_delay[2]; |
@@ -1459,7 +1459,7 @@ static void __devinit atmel_of_init_port(struct atmel_uart_port *atmel_port, | |||
1459 | /* | 1459 | /* |
1460 | * Configure the port from the platform device resource info. | 1460 | * Configure the port from the platform device resource info. |
1461 | */ | 1461 | */ |
1462 | static void __devinit atmel_init_port(struct atmel_uart_port *atmel_port, | 1462 | static void atmel_init_port(struct atmel_uart_port *atmel_port, |
1463 | struct platform_device *pdev) | 1463 | struct platform_device *pdev) |
1464 | { | 1464 | { |
1465 | struct uart_port *port = &atmel_port->uart; | 1465 | struct uart_port *port = &atmel_port->uart; |
@@ -1767,7 +1767,7 @@ static int atmel_serial_resume(struct platform_device *pdev) | |||
1767 | #define atmel_serial_resume NULL | 1767 | #define atmel_serial_resume NULL |
1768 | #endif | 1768 | #endif |
1769 | 1769 | ||
1770 | static int __devinit atmel_serial_probe(struct platform_device *pdev) | 1770 | static int atmel_serial_probe(struct platform_device *pdev) |
1771 | { | 1771 | { |
1772 | struct atmel_uart_port *port; | 1772 | struct atmel_uart_port *port; |
1773 | struct device_node *np = pdev->dev.of_node; | 1773 | struct device_node *np = pdev->dev.of_node; |
@@ -1859,7 +1859,7 @@ err: | |||
1859 | return ret; | 1859 | return ret; |
1860 | } | 1860 | } |
1861 | 1861 | ||
1862 | static int __devexit atmel_serial_remove(struct platform_device *pdev) | 1862 | static int atmel_serial_remove(struct platform_device *pdev) |
1863 | { | 1863 | { |
1864 | struct uart_port *port = platform_get_drvdata(pdev); | 1864 | struct uart_port *port = platform_get_drvdata(pdev); |
1865 | struct atmel_uart_port *atmel_port = to_atmel_uart_port(port); | 1865 | struct atmel_uart_port *atmel_port = to_atmel_uart_port(port); |
@@ -1884,7 +1884,7 @@ static int __devexit atmel_serial_remove(struct platform_device *pdev) | |||
1884 | 1884 | ||
1885 | static struct platform_driver atmel_serial_driver = { | 1885 | static struct platform_driver atmel_serial_driver = { |
1886 | .probe = atmel_serial_probe, | 1886 | .probe = atmel_serial_probe, |
1887 | .remove = __devexit_p(atmel_serial_remove), | 1887 | .remove = atmel_serial_remove, |
1888 | .suspend = atmel_serial_suspend, | 1888 | .suspend = atmel_serial_suspend, |
1889 | .resume = atmel_serial_resume, | 1889 | .resume = atmel_serial_resume, |
1890 | .driver = { | 1890 | .driver = { |