From: Felipe Balbi <balbi@ti.com>
To: Greg KH <gregkh@linuxfoundation.org>
Cc: <linux-serial@vger.kernel.org>, <linux-bluetooth@vger.kernel.org>,
<peter@hurleysoftware.com>, <m-karicheri2@ti.com>,
<b32955@freescale.com>,
Linux OMAP Mailing List <linux-omap@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Felipe Balbi <balbi@ti.com>
Subject: [PATCH 06/11] tty: serial: omap: remove some dead code
Date: Thu, 20 Mar 2014 14:30:02 -0500 [thread overview]
Message-ID: <1395343807-21618-6-git-send-email-balbi@ti.com> (raw)
In-Reply-To: <1395343807-21618-1-git-send-email-balbi@ti.com>
nobody passes a DTR_gpio to this driver, so
this code is not necessary.
Signed-off-by: Felipe Balbi <balbi@ti.com>
---
drivers/tty/serial/omap-serial.c | 39 ---------------------------------------
1 file changed, 39 deletions(-)
diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c
index d785327..c79d3e6 100644
--- a/drivers/tty/serial/omap-serial.c
+++ b/drivers/tty/serial/omap-serial.c
@@ -163,10 +163,6 @@ struct uart_omap_port {
u8 wakeups_enabled;
u32 features;
- int DTR_gpio;
- int DTR_inverted;
- int DTR_active;
-
struct serial_rs485 rs485;
int rts_gpio;
@@ -685,16 +681,6 @@ static void serial_omap_set_mctrl(struct uart_port *port, unsigned int mctrl)
serial_out(up, UART_MCR, up->mcr);
pm_runtime_mark_last_busy(up->dev);
pm_runtime_put_autosuspend(up->dev);
-
- if (gpio_is_valid(up->DTR_gpio) &&
- !!(mctrl & TIOCM_DTR) != up->DTR_active) {
- up->DTR_active = !up->DTR_active;
- if (gpio_cansleep(up->DTR_gpio))
- schedule_work(&up->qos_work);
- else
- gpio_set_value(up->DTR_gpio,
- up->DTR_active != up->DTR_inverted);
- }
}
static void serial_omap_break_ctl(struct uart_port *port, int break_state)
@@ -838,9 +824,6 @@ static void serial_omap_uart_qos_work(struct work_struct *work)
qos_work);
pm_qos_update_request(&up->pm_qos_request, up->latency);
- if (gpio_is_valid(up->DTR_gpio))
- gpio_set_value_cansleep(up->DTR_gpio,
- up->DTR_active != up->DTR_inverted);
}
static void
@@ -1655,28 +1638,6 @@ static int serial_omap_probe(struct platform_device *pdev)
if (IS_ERR(base))
return PTR_ERR(base);
- if (gpio_is_valid(omap_up_info->DTR_gpio) &&
- omap_up_info->DTR_present) {
- ret = devm_gpio_request(&pdev->dev, omap_up_info->DTR_gpio,
- "omap-serial");
- if (ret < 0)
- return ret;
- ret = gpio_direction_output(omap_up_info->DTR_gpio,
- omap_up_info->DTR_inverted);
- if (ret < 0)
- return ret;
- }
-
- if (gpio_is_valid(omap_up_info->DTR_gpio) &&
- omap_up_info->DTR_present) {
- up->DTR_gpio = omap_up_info->DTR_gpio;
- up->DTR_inverted = omap_up_info->DTR_inverted;
- } else {
- up->DTR_gpio = -EINVAL;
- }
-
- up->DTR_active = 0;
-
up->dev = &pdev->dev;
up->port.dev = &pdev->dev;
up->port.type = PORT_OMAP;
--
1.9.1.286.g5172cb3
next prev parent reply other threads:[~2014-03-20 19:36 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-20 19:29 [PATCH 01/11] tty: serial: add missing braces Felipe Balbi
2014-03-20 19:29 ` [PATCH 02/11] tty: serial: omap: switch over to devm_request_gpio Felipe Balbi
2014-03-20 19:29 ` [PATCH 03/11] tty: serial: omap: cleanup variable declarations Felipe Balbi
2014-03-20 19:30 ` [PATCH 04/11] tty: serial: omap: switch over to platform_get_resource Felipe Balbi
2014-03-20 19:30 ` [PATCH 05/11] tty: serial: omap: switch over to devm_ioremap_resource Felipe Balbi
2014-03-20 19:30 ` Felipe Balbi [this message]
2014-03-20 19:30 ` [PATCH 07/11] tty: serial: omap: remove unneeded singlethread workqueue Felipe Balbi
2014-03-20 19:30 ` [PATCH 08/11] In the uart_handle_cts_change(), uart_write_wakeup() is called after we call @uart_port->ops->start_tx() Felipe Balbi
2014-03-20 19:37 ` Felipe Balbi
2014-03-20 19:30 ` [PATCH 09/11] bluetooth: hci_ldisc: fix deadlock condition Felipe Balbi
2014-03-20 19:40 ` Marcel Holtmann
2014-03-20 20:17 ` Felipe Balbi
2014-03-27 0:47 ` Peter Hurley
2014-03-27 2:09 ` Felipe Balbi
2014-03-27 2:20 ` Peter Hurley
2014-03-27 3:36 ` Felipe Balbi
2014-05-14 16:42 ` Dean Jenkins
2014-03-20 19:30 ` [PATCH 10/11] Revert "serial: omap: unlock the port lock" Felipe Balbi
2014-03-25 18:28 ` Tony Lindgren
2014-03-27 0:39 ` Peter Hurley
2014-03-27 2:10 ` Felipe Balbi
2014-03-27 2:27 ` Peter Hurley
2014-03-27 3:37 ` Felipe Balbi
2014-03-27 14:54 ` Karicheri, Muralidharan
2014-03-20 19:30 ` [PATCH 11/11] serial: fix UART_IIR_ID Felipe Balbi
2014-04-22 14:22 ` [PATCH 01/11] tty: serial: add missing braces Felipe Balbi
2014-04-23 0:28 ` Greg KH
2014-04-23 14:53 ` Felipe Balbi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1395343807-21618-6-git-send-email-balbi@ti.com \
--to=balbi@ti.com \
--cc=b32955@freescale.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-bluetooth@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=linux-serial@vger.kernel.org \
--cc=m-karicheri2@ti.com \
--cc=peter@hurleysoftware.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®