From patchwork Thu Mar 20 19:30:02 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Balbi X-Patchwork-Id: 26763 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vc0-f198.google.com (mail-vc0-f198.google.com [209.85.220.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 079FD20143 for ; Thu, 20 Mar 2014 19:36:33 +0000 (UTC) Received: by mail-vc0-f198.google.com with SMTP id il7sf3185612vcb.9 for ; Thu, 20 Mar 2014 12:36:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe:content-type; bh=5x/1nzNJ/HDytj6U5oLM6lsVF59MPIKsA22P6H2mXfw=; b=W8c9h4P5FbcydYxhmLL9HsEmbbLMuwOuphKdbtInhA7bpZNY809n26Cz5+/TgV7sVs v6XUCTpuzpyQjaJ8DRA3UQQgF7gdsZMCa8zer60sPYdCtflVAI4CsfZrNaBkutbrRDM1 5LURS5LVO73gnOUbLbhGmyi7Sl64xwftpUmP0fC6msd97SbL84kvZDwqzZCgNT/nUKCS POdHc9Nr3rcGkwS5JlOeEAXWtdNcqGQsQGzGk4wrLAORno8n9PnpEP/84KZf6/1tFdj2 dMWyIkFsPBBm9mNZKCclWDEy+nLdAYM9NqowBFqH+IVCEVpl8PdUJquetZREiRKcH9cM mGew== X-Gm-Message-State: ALoCoQmfONRCUon9HvXtOipjTEAAJKTBCPDB7Qz2kuD7qwP0ZrwAvC3xnpxeDiKSAir5iTQaDz54 X-Received: by 10.236.144.102 with SMTP id m66mr16882559yhj.50.1395344193674; Thu, 20 Mar 2014 12:36:33 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.47.239 with SMTP id m102ls344159qga.8.gmail; Thu, 20 Mar 2014 12:36:33 -0700 (PDT) X-Received: by 10.52.237.167 with SMTP id vd7mr1406056vdc.54.1395344193586; Thu, 20 Mar 2014 12:36:33 -0700 (PDT) Received: from mail-ve0-f179.google.com (mail-ve0-f179.google.com [209.85.128.179]) by mx.google.com with ESMTPS id f9si642455vck.37.2014.03.20.12.36.33 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 20 Mar 2014 12:36:33 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.179 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.179; Received: by mail-ve0-f179.google.com with SMTP id db12so1510687veb.10 for ; Thu, 20 Mar 2014 12:36:33 -0700 (PDT) X-Received: by 10.52.107.35 with SMTP id gz3mr29781223vdb.8.1395344193497; Thu, 20 Mar 2014 12:36:33 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.78.9 with SMTP id i9csp414149vck; Thu, 20 Mar 2014 12:36:32 -0700 (PDT) X-Received: by 10.66.218.234 with SMTP id pj10mr6779065pac.156.1395344191553; Thu, 20 Mar 2014 12:36:31 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id yo5si2106760pab.333.2014.03.20.12.36.30; Thu, 20 Mar 2014 12:36:30 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759803AbaCTTgY (ORCPT + 26 others); Thu, 20 Mar 2014 15:36:24 -0400 Received: from arroyo.ext.ti.com ([192.94.94.40]:49184 "EHLO arroyo.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965028AbaCTTcD (ORCPT ); Thu, 20 Mar 2014 15:32:03 -0400 Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id s2KJW1Vx023143; Thu, 20 Mar 2014 14:32:01 -0500 Received: from DFLE72.ent.ti.com (dfle72.ent.ti.com [128.247.5.109]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id s2KJW06R017894; Thu, 20 Mar 2014 14:32:01 -0500 Received: from dlep32.itg.ti.com (157.170.170.100) by DFLE72.ent.ti.com (128.247.5.109) with Microsoft SMTP Server id 14.3.174.1; Thu, 20 Mar 2014 14:32:00 -0500 Received: from localhost (ileax41-snat.itg.ti.com [10.172.224.153]) by dlep32.itg.ti.com (8.14.3/8.13.8) with ESMTP id s2KJW0wX029837; Thu, 20 Mar 2014 14:32:00 -0500 From: Felipe Balbi To: Greg KH CC: , , , , , Linux OMAP Mailing List , Linux Kernel Mailing List , Felipe Balbi Subject: [PATCH 06/11] tty: serial: omap: remove some dead code Date: Thu, 20 Mar 2014 14:30:02 -0500 Message-ID: <1395343807-21618-6-git-send-email-balbi@ti.com> X-Mailer: git-send-email 1.9.1.286.g5172cb3 In-Reply-To: <1395343807-21618-1-git-send-email-balbi@ti.com> References: <1395343807-21618-1-git-send-email-balbi@ti.com> MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: balbi@ti.com X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.179 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , nobody passes a DTR_gpio to this driver, so this code is not necessary. Signed-off-by: Felipe Balbi --- 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;