diff options
author | Feng Tang <feng.tang@intel.com> | 2012-02-06 04:24:45 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-02-09 12:02:26 -0500 |
commit | 6f56d0f43656deb98c6366a133a75b5a7cf73a26 (patch) | |
tree | 00a635125f534db888af601b1e3b8b961c73eecc /drivers/tty/serial/pch_uart.c | |
parent | 30c6c6b5bf82d4f4a23235a0aa0657681d1c21f2 (diff) |
serial: pch_uart: trivail cleanup by removing the pch_uart_hal_request()
pch_uart_hal_request() has parameters which it never uses, also
it is very short, so merge it with its caller to make code cleaner.
No functional changes at all.
Signed-off-by: Feng Tang <feng.tang@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/serial/pch_uart.c')
-rw-r--r-- | drivers/tty/serial/pch_uart.c | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/drivers/tty/serial/pch_uart.c b/drivers/tty/serial/pch_uart.c index 811edcbe7304..aa4d07b4a9d5 100644 --- a/drivers/tty/serial/pch_uart.c +++ b/drivers/tty/serial/pch_uart.c | |||
@@ -364,15 +364,6 @@ static const struct file_operations port_regs_ops = { | |||
364 | }; | 364 | }; |
365 | #endif /* CONFIG_DEBUG_FS */ | 365 | #endif /* CONFIG_DEBUG_FS */ |
366 | 366 | ||
367 | static void pch_uart_hal_request(struct pci_dev *pdev, int fifosize, | ||
368 | int base_baud) | ||
369 | { | ||
370 | struct eg20t_port *priv = pci_get_drvdata(pdev); | ||
371 | |||
372 | priv->trigger_level = 1; | ||
373 | priv->fcr = 0; | ||
374 | } | ||
375 | |||
376 | static void pch_uart_hal_enable_interrupt(struct eg20t_port *priv, | 367 | static void pch_uart_hal_enable_interrupt(struct eg20t_port *priv, |
377 | unsigned int flag) | 368 | unsigned int flag) |
378 | { | 369 | { |
@@ -1674,7 +1665,8 @@ static struct eg20t_port *pch_uart_init_port(struct pci_dev *pdev, | |||
1674 | spin_lock_init(&priv->port.lock); | 1665 | spin_lock_init(&priv->port.lock); |
1675 | 1666 | ||
1676 | pci_set_drvdata(pdev, priv); | 1667 | pci_set_drvdata(pdev, priv); |
1677 | pch_uart_hal_request(pdev, fifosize, base_baud); | 1668 | priv->trigger_level = 1; |
1669 | priv->fcr = 0; | ||
1678 | 1670 | ||
1679 | #ifdef CONFIG_SERIAL_PCH_UART_CONSOLE | 1671 | #ifdef CONFIG_SERIAL_PCH_UART_CONSOLE |
1680 | pch_uart_ports[board->line_no] = priv; | 1672 | pch_uart_ports[board->line_no] = priv; |
@@ -1717,9 +1709,7 @@ static void pch_uart_exit_port(struct eg20t_port *priv) | |||
1717 | 1709 | ||
1718 | static void pch_uart_pci_remove(struct pci_dev *pdev) | 1710 | static void pch_uart_pci_remove(struct pci_dev *pdev) |
1719 | { | 1711 | { |
1720 | struct eg20t_port *priv; | 1712 | struct eg20t_port *priv = pci_get_drvdata(pdev); |
1721 | |||
1722 | priv = (struct eg20t_port *)pci_get_drvdata(pdev); | ||
1723 | 1713 | ||
1724 | pci_disable_msi(pdev); | 1714 | pci_disable_msi(pdev); |
1725 | 1715 | ||