From patchwork Tue Aug 21 09:15:54 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Balbi X-Patchwork-Id: 1353401 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 1550ADFB34 for ; Tue, 21 Aug 2012 09:28:16 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1T3khX-0004f9-9I; Tue, 21 Aug 2012 09:24:43 +0000 Received: from na3sys009aog138.obsmtp.com ([74.125.149.19]) by merlin.infradead.org with smtps (Exim 4.76 #1 (Red Hat Linux)) id 1T3kdd-00026I-75 for linux-arm-kernel@lists.infradead.org; Tue, 21 Aug 2012 09:20:42 +0000 Received: from mail-lpp01m010-f49.google.com ([209.85.215.49]) (using TLSv1) by na3sys009aob138.postini.com ([74.125.148.12]) with SMTP ID DSNKUDNS4BgatfmXgx/eNVHxggzyyQA6FC4R@postini.com; Tue, 21 Aug 2012 02:20:40 PDT Received: by lagu2 with SMTP id u2so4455156lag.8 for ; Tue, 21 Aug 2012 02:20:31 -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=LIjbI+H1OE8acgAIUX3t2uNl0wN3PxxYHKCcByp3S5o=; b=gw3AgO7kURPWlgjqQN0KAWuYaXVT3L4wsu1NwI97l3eFFTzmv9a32q5tWLYyGN3JaV S2bwDrIo5qmAX/P3cWyRGTuOyaEETPSYzICO6bj/diudurWkTZt3dv2m/kRqmH+X7Xn8 td+vcr/JZ6Y1HZzZN7tvYnAPlni/fU5ilA8eoOsSTgKFyaTExIY5zDxDL4TUBEWyDaT8 HQCJXFON8WF1kixUJTGUwykZLbOTxkk2E6qacFIlVstIoqUfQBA05SuTXoLHcHPs1Z8c CnNOz74iTF/vt1BVjNVEQfIPfmZW0CqYS5cO6L89fLGgTrd72L47ar2tJSoTCK9Ib7Nd P5og== Received: by 10.112.50.106 with SMTP id b10mr636097lbo.51.1345540831024; Tue, 21 Aug 2012 02:20:31 -0700 (PDT) Received: from localhost (cs78217178.pp.htv.fi. [62.78.217.178]) by mx.google.com with ESMTPS id r8sm280834lba.15.2012.08.21.02.20.29 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 21 Aug 2012 02:20:30 -0700 (PDT) From: Felipe Balbi To: alan@linux.intel.com Subject: [RFC/PATCH 12/13] serial: omap: drop unnecessary check from remove Date: Tue, 21 Aug 2012 12:15:54 +0300 Message-Id: <1345540555-24359-13-git-send-email-balbi@ti.com> X-Mailer: git-send-email 1.7.12.rc3 In-Reply-To: <1345540555-24359-1-git-send-email-balbi@ti.com> References: <1345540555-24359-1-git-send-email-balbi@ti.com> X-Gm-Message-State: ALoCoQne4qyM6zQXHjtQmprHb6PsNu5Im6DaF5a3Ho9mrynViDKvQVFEm1h7mbLx+TYxD251Yb16 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.19 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, 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. 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 ba9cdf1..25d2055 100644 --- a/drivers/tty/serial/omap-serial.c +++ b/drivers/tty/serial/omap-serial.c @@ -1334,13 +1334,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; }