From patchwork Fri Nov 27 21:39:01 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Hurley X-Patchwork-Id: 7715491 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 5C171BEEE1 for ; Fri, 27 Nov 2015 21:42:31 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 837282065D for ; Fri, 27 Nov 2015 21:42:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AB6D0205B3 for ; Fri, 27 Nov 2015 21:42:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755454AbbK0Vjr (ORCPT ); Fri, 27 Nov 2015 16:39:47 -0500 Received: from mail-ig0-f170.google.com ([209.85.213.170]:33538 "EHLO mail-ig0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755350AbbK0Vjk (ORCPT ); Fri, 27 Nov 2015 16:39:40 -0500 Received: by igcmv3 with SMTP id mv3so37940949igc.0 for ; Fri, 27 Nov 2015 13:39:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hurleysoftware-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Xya/5VCtcMowCrzNQDhMsdBePpm/+OP8wI3Bgl+JS7Y=; b=DEgrzD5tqPA41su6qLldn1ilQz2i5lggZU/goZcpmROqe8D/RFYK5UxvpVLqAmSCUY JS18t3s5FEBwL+dfh8cBucSp+knbemgPCDYEepJwIjiBWHQjNwCPZ5PcjMdiVr4cbWP6 YcRciOTCRt5xruxoECIVYBOgIyDmNGu+qDz2ZAa4+Sxno4+AW1PIs0H4OqFI92Y76OFX jLyPEaNUlKQ/L1ylxu8b15or0sDQd9RV+rzmmoER4dcZ9MGf+wH/xvxHA5l4k1gQidA/ zP6CzTSyRGLnQC16I++tZ7GkTamiSp+idVdqAejN7o4BFewJvLKTxXhpaZk4LIKwqIu+ 2ocw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Xya/5VCtcMowCrzNQDhMsdBePpm/+OP8wI3Bgl+JS7Y=; b=bPHndwFWFjtJ6ZOPsmAcVsuL4GZNcBYIhEvCiNgJ4EJE3skNpTJz6eCFvnem5/WuX7 7oxA/KLSrErmA/Un/1p7k0EUF4HzAW3TBeGnJw/MKy0ZLQC+bacH9Nw0X5m9qop3VxaK uYtdw+puybCuFtmE6g9TFglJS/UYggJ4k4NAW6krZvu0YOJUx3jcf/3us2K/Gh0/ijru A7v0+7MhFPKsLZpVZaZ7oHXMqBbH+VBbWRFw2mLFEfTSQpg0PWWV1fI+0ScCK8mDJ9G1 kaDi/mX3aw7xq9xP1tLTckrGubq4hmRhSCP5GZYO4sIKfOXrhfPeQ3OTIhMy3elvwSj3 eVQw== X-Gm-Message-State: ALoCoQkBs0xzsTYcXfFuGfiWOiK8S9NCdFXJMJafqV7wBetg4jNL2UPs6mFMzN79jidE08V1AiZj X-Received: by 10.50.64.147 with SMTP id o19mr9712843igs.52.1448660379501; Fri, 27 Nov 2015 13:39:39 -0800 (PST) Received: from thor.lan (cpe-76-190-194-55.neo.res.rr.com. [76.190.194.55]) by smtp.gmail.com with ESMTPSA id g7sm3601638igz.19.2015.11.27.13.39.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 27 Nov 2015 13:39:39 -0800 (PST) From: Peter Hurley To: Greg Kroah-Hartman Cc: Jiri Slaby , linux-kernel@vger.kernel.org, Andi Kleen , Peter Hurley , Lauro Ramos Venancio , Aloisio Almeida Jr , Samuel Ortiz , "David S. Miller" , linux-wireless@vger.kernel.org Subject: [PATCH 04/19] NFC: nci: Remove dead code Date: Fri, 27 Nov 2015 16:39:01 -0500 Message-Id: <1448660356-6328-5-git-send-email-peter@hurleysoftware.com> X-Mailer: git-send-email 2.6.3 In-Reply-To: <1448660356-6328-1-git-send-email-peter@hurleysoftware.com> References: <1448660356-6328-1-git-send-email-peter@hurleysoftware.com> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,T_RP_MATCHES_RCVD,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The N_NCI ldisc does not define a flush_buffer() ldisc method, so the check when opening the ldisc is always false. Cc: Lauro Ramos Venancio Cc: Aloisio Almeida Jr Cc: Samuel Ortiz Cc: "David S. Miller" Cc: Signed-off-by: Peter Hurley --- net/nfc/nci/uart.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/net/nfc/nci/uart.c b/net/nfc/nci/uart.c index 21d8875..c468eab 100644 --- a/net/nfc/nci/uart.c +++ b/net/nfc/nci/uart.c @@ -171,14 +171,7 @@ static int nci_uart_tty_open(struct tty_struct *tty) tty->disc_data = NULL; tty->receive_room = 65536; - /* Flush any pending characters in the driver and line discipline. */ - - /* FIXME: why is this needed. Note don't use ldisc_ref here as the - * open path is before the ldisc is referencable. - */ - - if (tty->ldisc->ops->flush_buffer) - tty->ldisc->ops->flush_buffer(tty); + /* Flush any pending characters in the driver */ tty_driver_flush_buffer(tty); return 0;