From patchwork Thu Aug 23 10:32:51 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Balbi X-Patchwork-Id: 1366081 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id 9A276DF2AB for ; Thu, 23 Aug 2012 10:46:21 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1T4UrL-000351-61; Thu, 23 Aug 2012 10:41:56 +0000 Received: from na3sys009aog114.obsmtp.com ([74.125.149.211]) by merlin.infradead.org with smtps (Exim 4.76 #1 (Red Hat Linux)) id 1T4UnB-0000tj-LL for linux-arm-kernel@lists.infradead.org; Thu, 23 Aug 2012 10:37:38 +0000 Received: from mail-lpp01m010-f49.google.com ([209.85.215.49]) (using TLSv1) by na3sys009aob114.postini.com ([74.125.148.12]) with SMTP ID DSNKUDYH7x+cZG19DL3Vr6QnK85jpozcf3N1@postini.com; Thu, 23 Aug 2012 03:37:37 PDT Received: by lagu2 with SMTP id u2so438233lag.22 for ; Thu, 23 Aug 2012 03:37:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=Sj1ewJNKv5J1gLeo2+M+G/RqLcJUNYEWSu5aF+gEjSc=; b=gFw8XKPBFkKeMDB7JlVs0EElO09mFTHxY9kMfqG5c4ZD2QyyBJKIh4KYFtU4Guz6UR vdpB6XOEBFfB8kasp0rI1ucKs2Gu5DEjCInQEHW919ZgJK3j2UWWG+bXlFiwiJm7xhkv F7R51kFur1NFSRgBmECT2SFXnPqOsv88yutMzxh/hUr1XkgBqc38Iilgd+94oNKw7f6U syPgzrYf/laLHuKuYGKMqpnNu1p5kfjnUDg5LmeuSp+J+p6iKLDF3K47B+iaygUGr6cT zZd28HTgboM3QSx3EqcnqWLI6j9c9IPgy7/Ew+26CFSR70mDYOpcV6vEZBoECY+ClmB8 gPGQ== Received: by 10.112.38.67 with SMTP id e3mr593926lbk.98.1345718254078; Thu, 23 Aug 2012 03:37:34 -0700 (PDT) Received: from localhost (cs78217178.pp.htv.fi. [62.78.217.178]) by mx.google.com with ESMTPS id n7sm1781281lbk.10.2012.08.23.03.37.32 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 23 Aug 2012 03:37:33 -0700 (PDT) From: Felipe Balbi To: alan@linux.intel.com Subject: [PATCH v3 11/23] serial: omap: drop unnecessary check from remove Date: Thu, 23 Aug 2012 13:32:51 +0300 Message-Id: <1345717983-18179-12-git-send-email-balbi@ti.com> X-Mailer: git-send-email 1.7.12.rc3 In-Reply-To: <1345717983-18179-1-git-send-email-balbi@ti.com> References: <1345717983-18179-1-git-send-email-balbi@ti.com> X-Gm-Message-State: ALoCoQlBMIipNBjHCc6cls9uJuonw1oX31XSXgPGXJhkCOLtbUKwWqScRhjC4J59DCQe3QBpO0Y4 X-Spam-Note: CRM114 invocation failed X-Spam-Score: -4.2 (----) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-4.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/, medium trust [74.125.149.211 listed in list.dnswl.org] 0.0 KHOP_BIG_TO_CC Sent to 10+ recipients instaed of Bcc or a list -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Kevin Hilman , Tony Lindgren , Linux Kernel Mailing List , Felipe Balbi , Santosh Shilimkar , linux-serial@vger.kernel.org, Sourav Poddar , Linux OMAP Mailing List , Shubhrajyoti Datta , Linux ARM Kernel Mailing List X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org if platform_get_drvdata() returns NULL, that's quite a nasty bug on the driver which we want to catch ASAP. Otherwise, that check is hugely unneeded. Tested-by: Shubhrajyoti D Acked-by: Santosh Shilimkar Signed-off-by: Felipe Balbi --- drivers/tty/serial/omap-serial.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c index 9f709d4..9581741 100644 --- a/drivers/tty/serial/omap-serial.c +++ b/drivers/tty/serial/omap-serial.c @@ -1336,13 +1336,10 @@ static int serial_omap_remove(struct platform_device *dev) { struct uart_omap_port *up = platform_get_drvdata(dev); - if (up) { - pm_runtime_disable(up->dev); - uart_remove_one_port(&serial_omap_reg, &up->port); - pm_qos_remove_request(&up->pm_qos_request); - } + pm_runtime_disable(up->dev); + uart_remove_one_port(&serial_omap_reg, &up->port); + pm_qos_remove_request(&up->pm_qos_request); - platform_set_drvdata(dev, NULL); return 0; }