From patchwork Sat Nov 17 00:09:16 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joachim Eastwood X-Patchwork-Id: 1757611 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 84A98DF288 for ; Sat, 17 Nov 2012 00:12:38 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TZVz9-0007iF-VI; Sat, 17 Nov 2012 00:10:12 +0000 Received: from mail-lb0-f177.google.com ([209.85.217.177]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TZVz6-0007hw-FM for linux-arm-kernel@lists.infradead.org; Sat, 17 Nov 2012 00:10:09 +0000 Received: by mail-lb0-f177.google.com with SMTP id n10so748998lbo.36 for ; Fri, 16 Nov 2012 16:10:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=PuX/IRcFRIjbrTo3Qow512d7Y3NFm4rM+2ycfL9jbE0=; b=HyhTcFlaYd40ToSZ66lSG+nRV/pUurj32WiHio+44c6Ci5sMlmnnTpiY1WHTm/gHjN MMLekD2OcsA+J/trH/r28yJeIGZFzNw7t/F1bHdT1vnSeMroW9mqp/CXLcjSttVwE9Zx SPw4OVxpIfQsNZsNCh9xGc9+dRiX3kEsU8Q4Yvx/y6rflKor6B/TOGjy2TnGwv/pl5Lm z803SD3QsDhsk7ayfEXn8LjA/qkdPdFuZ68JuukUZpRjO0jq7k2em0n92ix4L7mWq2oV NaLVFXbHknpuX+44jnNxoswDQo/pEW81RP0XnyTTsmtOk4+XjSQC+KlY33+KwSq82e+G cvGQ== Received: by 10.112.26.67 with SMTP id j3mr2655019lbg.39.1353111004238; Fri, 16 Nov 2012 16:10:04 -0800 (PST) Received: from localhost.localdomain ([90.149.223.57]) by mx.google.com with ESMTPS id e4sm1165099lby.12.2012.11.16.16.10.03 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 16 Nov 2012 16:10:03 -0800 (PST) From: Joachim Eastwood To: linux@arm.linux.org.uk, gregkh@linuxfoundation.org Subject: [PATCH] serial: atmel_serial: remove atmel open/close hooks Date: Sat, 17 Nov 2012 01:09:16 +0100 Message-Id: <1353110956-17541-1-git-send-email-manabian@gmail.com> X-Mailer: git-send-email 1.8.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20121116_191008_774176_D820FA4C X-CRM114-Status: GOOD ( 12.92 ) X-Spam-Score: -2.7 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (manabian[at]gmail.com) -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.217.177 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] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Cc: Joachim Eastwood , nicolas.ferre@atmel.com, avictor.za@gmail.com, linux-serial@vger.kernel.org, plagnioj@jcrosoft.com, linux-arm-kernel@lists.infradead.org, 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 After serial_at91.h was removed the atmel_open/close_hook code is now useless. Signed-off-by: Joachim Eastwood Acked-by: Nicolas Ferre --- Hi, This patch depends on [RFC 3/3] ARM/AVR32: get rid of serial_at91.h patch from Russell King. Patch based on current linux-next with "[RFC 3/3] ARM/AVR32: get rid of serial_at91.h" patch on top. There is a small conflict with Russell's patch in next now due to another header change. If there is another tree this patch should be based on please let me know. regards Joachim Eastwood drivers/tty/serial/atmel_serial.c | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/drivers/tty/serial/atmel_serial.c b/drivers/tty/serial/atmel_serial.c index 76e4c05..5c2337d 100644 --- a/drivers/tty/serial/atmel_serial.c +++ b/drivers/tty/serial/atmel_serial.c @@ -113,9 +113,6 @@ static void atmel_stop_rx(struct uart_port *port); #define UART_PUT_TCR(port,v) __raw_writel(v, (port)->membase + ATMEL_PDC_TCR) #define UART_GET_TCR(port) __raw_readl((port)->membase + ATMEL_PDC_TCR) -static int (*atmel_open_hook)(struct uart_port *); -static void (*atmel_close_hook)(struct uart_port *); - struct atmel_dma_buffer { unsigned char *buf; dma_addr_t dma_addr; @@ -976,18 +973,6 @@ static int atmel_startup(struct uart_port *port) pdc->ofs = 0; } - /* - * If there is a specific "open" function (to register - * control line interrupts) - */ - if (atmel_open_hook) { - retval = atmel_open_hook(port); - if (retval) { - free_irq(port->irq, port); - return retval; - } - } - /* Save current CSR for comparison in atmel_tasklet_func() */ atmel_port->irq_status_prev = UART_GET_CSR(port); atmel_port->irq_status = atmel_port->irq_status_prev; @@ -1062,13 +1047,6 @@ static void atmel_shutdown(struct uart_port *port) * Free the interrupt */ free_irq(port->irq, port); - - /* - * If there is a specific "close" function (to unregister - * control line interrupts) - */ - if (atmel_close_hook) - atmel_close_hook(port); } /*