From patchwork Wed Apr 23 14:58:34 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Balbi X-Patchwork-Id: 28905 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ve0-f197.google.com (mail-ve0-f197.google.com [209.85.128.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id BE8CA203AC for ; Wed, 23 Apr 2014 15:13:06 +0000 (UTC) Received: by mail-ve0-f197.google.com with SMTP id pa12sf4208036veb.0 for ; Wed, 23 Apr 2014 08:13:06 -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=EfvY8Hmqt20Nh9KqORtPu2omqEn3A6RFA9l3orWohgc=; b=Dnk4SUUjtIUfs6kpQw81U+q5JWhPJ81F/2mWxjXz3gRH1mMh9i7orQH1jz00Xg1Q8F fRslSAzgKtIWo2E+KZ9+8RSPKGKbxEGvnJBiDt+enrOK0M6TgQFMwR+Bb7PtV6hHcmN1 VCgN13R6t9BUTAUme0fjydoz+Dyh9gC744I/bL/NJp3f6dpBpjaPHggL+e7qKewYUO0/ 47PWyIlA3ZDGG/nt1ERqb5VGH5oCFABrPWy15nZ9mzAunhgCNvIss+A9lglxc2EbrZ+k Ksp7DLmXf6gYllxzof7zHhT0hhXFJPgF5ezi2jdkT7zRAKN8iKcvyYyWj+DR7OryRsVG 1dWA== X-Gm-Message-State: ALoCoQmiXykOTVFlFhS0kKNM8nD1x6Em54JBGU66kTxhgs7qRd8PmUA4mms6KmkKHCgnydQfhfPI X-Received: by 10.236.182.230 with SMTP id o66mr21315693yhm.12.1398265986412; Wed, 23 Apr 2014 08:13:06 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.101.213 with SMTP id u79ls650076qge.79.gmail; Wed, 23 Apr 2014 08:13:06 -0700 (PDT) X-Received: by 10.58.13.104 with SMTP id g8mr41686447vec.16.1398265986281; Wed, 23 Apr 2014 08:13:06 -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 sn5si219250vdc.101.2014.04.23.08.13.06 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 23 Apr 2014 08:13:06 -0700 (PDT) Received-SPF: none (google.com: patch+caf_=patchwork-forward=linaro.org@linaro.org does not designate permitted sender hosts) client-ip=209.85.128.179; Received: by mail-ve0-f179.google.com with SMTP id db12so1296336veb.24 for ; Wed, 23 Apr 2014 08:13:06 -0700 (PDT) X-Received: by 10.220.7.131 with SMTP id d3mr466227vcd.45.1398265986205; Wed, 23 Apr 2014 08:13:06 -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.221.72 with SMTP id ib8csp111596vcb; Wed, 23 Apr 2014 08:13:05 -0700 (PDT) X-Received: by 10.68.194.134 with SMTP id hw6mr56111947pbc.49.1398265985395; Wed, 23 Apr 2014 08:13:05 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id fn10si803371pad.115.2014.04.23.08.13.04; Wed, 23 Apr 2014 08:13:04 -0700 (PDT) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757366AbaDWPEn (ORCPT + 27 others); Wed, 23 Apr 2014 11:04:43 -0400 Received: from arroyo.ext.ti.com ([192.94.94.40]:32894 "EHLO arroyo.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757197AbaDWPBP (ORCPT ); Wed, 23 Apr 2014 11:01:15 -0400 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id s3NF19Z3005004; Wed, 23 Apr 2014 10:01:09 -0500 Received: from DLEE71.ent.ti.com (dlee71.ent.ti.com [157.170.170.114]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id s3NF19WX021491; Wed, 23 Apr 2014 10:01:09 -0500 Received: from dlep32.itg.ti.com (157.170.170.100) by DLEE71.ent.ti.com (157.170.170.114) with Microsoft SMTP Server id 14.3.174.1; Wed, 23 Apr 2014 10:01:09 -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 s3NF181B001834; Wed, 23 Apr 2014 10:01:09 -0500 From: Felipe Balbi To: Greg KH CC: , , , , , Linux Kernel Mailing List , , , , Linux OMAP Mailing List , Tony Lindgren , Felipe Balbi Subject: [PATCH 10/13] tty: serial: omap: remove some dead code Date: Wed, 23 Apr 2014 09:58:34 -0500 Message-ID: <1398265117-11793-10-git-send-email-balbi@ti.com> X-Mailer: git-send-email 1.9.2.459.g68773ac In-Reply-To: <1398265117-11793-1-git-send-email-balbi@ti.com> References: <1398265117-11793-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: patch+caf_=patchwork-forward=linaro.org@linaro.org does not designate permitted sender hosts) 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 b46aaf3..6654682 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; @@ -694,16 +690,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) @@ -847,9 +833,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 @@ -1672,28 +1655,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;