From patchwork Thu Sep 6 12:45:28 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Balbi X-Patchwork-Id: 1414721 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 C3F84DFFCF for ; Thu, 6 Sep 2012 13:00:04 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1T9bcJ-00067G-3J; Thu, 06 Sep 2012 12:55:32 +0000 Received: from na3sys009aob106.obsmtp.com ([74.125.149.76] helo=na3sys009aog106.obsmtp.com) by merlin.infradead.org with smtps (Exim 4.76 #1 (Red Hat Linux)) id 1T9bXZ-0002i0-Vn for linux-arm-kernel@lists.infradead.org; Thu, 06 Sep 2012 12:50:42 +0000 Received: from mail-lpp01m010-f49.google.com ([209.85.215.49]) (using TLSv1) by na3sys009aob106.postini.com ([74.125.148.12]) with SMTP ID DSNKUEicG2ERqYy39CMQ4jhQcRQB6Y51LfMm@postini.com; Thu, 06 Sep 2012 05:50:37 PDT Received: by lagu2 with SMTP id u2so1046337lag.36 for ; Thu, 06 Sep 2012 05:50: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=ehbkEDAcbyetlh/ndN/r4f1iK5JTOO72PsZYjwKHgm4=; b=VykKL2Ow8pBE9Ucc5QiJqOqOyNZKDTpVQOKVSuLcw56ExHsENIo0XNjkN1gDfGiU/4 oV73T31t0bfY8pq1UPzr8OtUqzVbSqqXiqlyGtjJuOss+zKfr9R962lvrNda0dVEJ7P7 FxfyEkiiDBO9kkd+/aFwH62xnuYgGQJpA5nMPIsr876EbjcBFjMV5f6aF9On5Gdx2u38 GJToXfBXguwFQnaYaKXgAYv0vRrjIqOBoZLoIIKW1YEv7Ef1vBfiK6BEAYlZj7nk6EiD IzGAyYMPbNqGEr8B/vqf0HvaXO0ksKfEMrAbUxLRjNpwV9Nbe+s8IoNx6lC9wgC0xy59 iRFg== Received: by 10.152.112.136 with SMTP id iq8mr1815381lab.18.1346935834037; Thu, 06 Sep 2012 05:50:34 -0700 (PDT) Received: from localhost (cs78217178.pp.htv.fi. [62.78.217.178]) by mx.google.com with ESMTPS id s8sm564981lba.7.2012.09.06.05.50.32 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 06 Sep 2012 05:50:33 -0700 (PDT) From: Felipe Balbi To: Greg KH Subject: [PATCH v4 09/21] serial: omap: drop unnecessary check from remove Date: Thu, 6 Sep 2012 15:45:28 +0300 Message-Id: <1346935540-1792-10-git-send-email-balbi@ti.com> X-Mailer: git-send-email 1.7.12.rc3 In-Reply-To: <1346935540-1792-1-git-send-email-balbi@ti.com> References: <20120906122948.GC29202@arwen.pp.htv.fi> <1346935540-1792-1-git-send-email-balbi@ti.com> X-Gm-Message-State: ALoCoQkNI0pU+UBaLCDAovcirn+ZW7W8wZIFPoycCT/UejWU/Iw317pldGxDafw+1KWlrAA9CF69 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.76 listed in list.dnswl.org] -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 , alan@linux.intel.com 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 8a696a4..c19d340 100644 --- a/drivers/tty/serial/omap-serial.c +++ b/drivers/tty/serial/omap-serial.c @@ -1369,13 +1369,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; }