From patchwork Tue Apr 8 14:44:02 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 27989 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ie0-f199.google.com (mail-ie0-f199.google.com [209.85.223.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id DBA1220447 for ; Tue, 8 Apr 2014 14:45:56 +0000 (UTC) Received: by mail-ie0-f199.google.com with SMTP id rl12sf4492264iec.10 for ; Tue, 08 Apr 2014 07:45:56 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:in-reply-to :references:cc:subject:precedence:list-id:list-unsubscribe:list-post :list-help:list-subscribe:mime-version:sender:errors-to :x-original-sender:x-original-authentication-results:mailing-list :list-archive:content-type:content-transfer-encoding; bh=4ek1lc/jqkQOcCwHjiuWXquAY1JKvG++XKdOEmSbwo0=; b=YJFSh8VemYbjjkxdX+kA/3UIrkCFhI9niQ9K0RAzirLBMj8fhKL//9N+oHLzk33uzD n/ljhzS2BGLDEFhQo/calt111sfKXTpNhjIdgLftSHXTyDbZ1suJ28wEOswCzO05UcAO 5eJdohKo39mzjkrvKOyLi8xrLh6WL0LTCquILz1R/gedki0nj+yz+hLPOVlrIBGt7AEC iQxNxwnifykYrrzaz6dV9r9uhxvFwO7G/2kxfbSEeZ4xHuftwEKWNze22+WSFbssI58M kyWcQOjqHcyUhJaiWhQptze7WgwSTZwCyx6w83CWKneOn1LsamWmzdkQQkkzJFk/1utV P/9g== X-Gm-Message-State: ALoCoQkmzEqYuGdGo1AIvs6j49k4MBlRKh7spAQezrVUsk6GhXqHPMhyuaP2k81fzMcIBJQ06GJq X-Received: by 10.182.213.5 with SMTP id no5mr1960451obc.15.1396968356318; Tue, 08 Apr 2014 07:45:56 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.93.194 with SMTP id d60ls231733qge.86.gmail; Tue, 08 Apr 2014 07:45:56 -0700 (PDT) X-Received: by 10.58.185.145 with SMTP id fc17mr3733910vec.14.1396968356148; Tue, 08 Apr 2014 07:45:56 -0700 (PDT) Received: from mail-ve0-f169.google.com (mail-ve0-f169.google.com [209.85.128.169]) by mx.google.com with ESMTPS id tv3si433726vdc.72.2014.04.08.07.45.56 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 08 Apr 2014 07:45:56 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.169 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.169; Received: by mail-ve0-f169.google.com with SMTP id pa12so890473veb.28 for ; Tue, 08 Apr 2014 07:45:56 -0700 (PDT) X-Received: by 10.58.111.163 with SMTP id ij3mr880829veb.26.1396968356050; Tue, 08 Apr 2014 07:45:56 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.12.8 with SMTP id v8csp251659vcv; Tue, 8 Apr 2014 07:45:55 -0700 (PDT) X-Received: by 10.224.65.194 with SMTP id k2mr4848048qai.59.1396968355417; Tue, 08 Apr 2014 07:45:55 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id s6si918376qas.265.2014.04.08.07.45.53 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 08 Apr 2014 07:45:54 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of xen-devel-bounces@lists.xen.org designates 50.57.142.19 as permitted sender) client-ip=50.57.142.19; Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WXXGK-0000Mm-G2; Tue, 08 Apr 2014 14:44:32 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WXXGH-0000I3-Mm for xen-devel@lists.xenproject.org; Tue, 08 Apr 2014 14:44:30 +0000 Received: from [85.158.139.211:11964] by server-15.bemta-5.messagelabs.com id 7B/4F-11079-D4B04435; Tue, 08 Apr 2014 14:44:29 +0000 X-Env-Sender: julien.grall@linaro.org X-Msg-Ref: server-12.tower-206.messagelabs.com!1396968266!6251149!1 X-Originating-IP: [74.125.83.50] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 6.11.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 32062 invoked from network); 8 Apr 2014 14:44:28 -0000 Received: from mail-ee0-f50.google.com (HELO mail-ee0-f50.google.com) (74.125.83.50) by server-12.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 8 Apr 2014 14:44:28 -0000 Received: by mail-ee0-f50.google.com with SMTP id c13so768100eek.23 for ; Tue, 08 Apr 2014 07:44:26 -0700 (PDT) X-Received: by 10.14.48.2 with SMTP id u2mr123276eeb.5.1396968266496; Tue, 08 Apr 2014 07:44:26 -0700 (PDT) Received: from belegaer.uk.xensource.com ([185.25.64.249]) by mx.google.com with ESMTPSA id m42sm5031709eex.21.2014.04.08.07.44.25 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 08 Apr 2014 07:44:25 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xenproject.org Date: Tue, 8 Apr 2014 15:44:02 +0100 Message-Id: <1396968247-8768-14-git-send-email-julien.grall@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1396968247-8768-1-git-send-email-julien.grall@linaro.org> References: <1396968247-8768-1-git-send-email-julien.grall@linaro.org> Cc: stefano.stabellini@citrix.com, Keir Fraser , Julien Grall , tim@xen.org, ian.campbell@citrix.com Subject: [Xen-devel] [PATCH v3 13/18] xen/serial: remove serial_dt_irq X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: julien.grall@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.169 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Archive: This function was only used for ARM IRQ routing which has been removed in an earlier patch. Signed-off-by: Julien Grall Acked-by: Ian Campbell CC: Keir Fraser --- Changes in v2: - Specify in the commit this patch is ARM specific --- xen/drivers/char/exynos4210-uart.c | 8 -------- xen/drivers/char/ns16550.c | 11 ----------- xen/drivers/char/omap-uart.c | 8 -------- xen/drivers/char/pl011.c | 8 -------- xen/drivers/char/serial.c | 9 --------- xen/include/xen/serial.h | 5 ----- 6 files changed, 49 deletions(-) diff --git a/xen/drivers/char/exynos4210-uart.c b/xen/drivers/char/exynos4210-uart.c index d49e1fe..370539c 100644 --- a/xen/drivers/char/exynos4210-uart.c +++ b/xen/drivers/char/exynos4210-uart.c @@ -275,13 +275,6 @@ static int __init exynos4210_uart_irq(struct serial_port *port) return uart->irq.irq; } -static const struct dt_irq __init *exynos4210_uart_dt_irq(struct serial_port *port) -{ - struct exynos4210_uart *uart = port->uart; - - return &uart->irq; -} - static const struct vuart_info *exynos4210_vuart_info(struct serial_port *port) { struct exynos4210_uart *uart = port->uart; @@ -299,7 +292,6 @@ static struct uart_driver __read_mostly exynos4210_uart_driver = { .putc = exynos4210_uart_putc, .getc = exynos4210_uart_getc, .irq = exynos4210_uart_irq, - .dt_irq_get = exynos4210_uart_dt_irq, .vuart_info = exynos4210_vuart_info, }; diff --git a/xen/drivers/char/ns16550.c b/xen/drivers/char/ns16550.c index 44e13b7..cc86921 100644 --- a/xen/drivers/char/ns16550.c +++ b/xen/drivers/char/ns16550.c @@ -717,14 +717,6 @@ static int __init ns16550_irq(struct serial_port *port) return ((uart->irq > 0) ? uart->irq : -1); } -#ifdef HAS_DEVICE_TREE -static const struct dt_irq __init *ns16550_dt_irq(struct serial_port *port) -{ - struct ns16550 *uart = port->uart; - return &uart->dt_irq; -} -#endif - #ifdef CONFIG_ARM static const struct vuart_info *ns16550_vuart_info(struct serial_port *port) { @@ -744,9 +736,6 @@ static struct uart_driver __read_mostly ns16550_driver = { .putc = ns16550_putc, .getc = ns16550_getc, .irq = ns16550_irq, -#ifdef HAS_DEVICE_TREE - .dt_irq_get = ns16550_dt_irq, -#endif #ifdef CONFIG_ARM .vuart_info = ns16550_vuart_info, #endif diff --git a/xen/drivers/char/omap-uart.c b/xen/drivers/char/omap-uart.c index 49ae1a4..b8da509 100644 --- a/xen/drivers/char/omap-uart.c +++ b/xen/drivers/char/omap-uart.c @@ -262,13 +262,6 @@ static int __init omap_uart_irq(struct serial_port *port) return ((uart->irq.irq > 0) ? uart->irq.irq : -1); } -static const struct dt_irq __init *omap_uart_dt_irq(struct serial_port *port) -{ - struct omap_uart *uart = port->uart; - - return &uart->irq; -} - static const struct vuart_info *omap_vuart_info(struct serial_port *port) { struct omap_uart *uart = port->uart; @@ -286,7 +279,6 @@ static struct uart_driver __read_mostly omap_uart_driver = { .putc = omap_uart_putc, .getc = omap_uart_getc, .irq = omap_uart_irq, - .dt_irq_get = omap_uart_dt_irq, .vuart_info = omap_vuart_info, }; diff --git a/xen/drivers/char/pl011.c b/xen/drivers/char/pl011.c index 90bf0c6..459e686 100644 --- a/xen/drivers/char/pl011.c +++ b/xen/drivers/char/pl011.c @@ -189,13 +189,6 @@ static int __init pl011_irq(struct serial_port *port) return ((uart->irq.irq > 0) ? uart->irq.irq : -1); } -static const struct dt_irq __init *pl011_dt_irq(struct serial_port *port) -{ - struct pl011 *uart = port->uart; - - return &uart->irq; -} - static const struct vuart_info *pl011_vuart(struct serial_port *port) { struct pl011 *uart = port->uart; @@ -213,7 +206,6 @@ static struct uart_driver __read_mostly pl011_driver = { .putc = pl011_putc, .getc = pl011_getc, .irq = pl011_irq, - .dt_irq_get = pl011_dt_irq, .vuart_info = pl011_vuart, }; diff --git a/xen/drivers/char/serial.c b/xen/drivers/char/serial.c index 9b006f2..44026b1 100644 --- a/xen/drivers/char/serial.c +++ b/xen/drivers/char/serial.c @@ -500,15 +500,6 @@ int __init serial_irq(int idx) return -1; } -const struct dt_irq __init *serial_dt_irq(int idx) -{ - if ( (idx >= 0) && (idx < ARRAY_SIZE(com)) && - com[idx].driver && com[idx].driver->dt_irq_get ) - return com[idx].driver->dt_irq_get(&com[idx]); - - return NULL; -} - const struct vuart_info *serial_vuart_info(int idx) { if ( (idx >= 0) && (idx < ARRAY_SIZE(com)) && diff --git a/xen/include/xen/serial.h b/xen/include/xen/serial.h index f38c9b7..9f4451b 100644 --- a/xen/include/xen/serial.h +++ b/xen/include/xen/serial.h @@ -81,8 +81,6 @@ struct uart_driver { int (*getc)(struct serial_port *, char *); /* Get IRQ number for this port's serial line: returns -1 if none. */ int (*irq)(struct serial_port *); - /* Get IRQ device node for this port's serial line: returns NULL if none. */ - const struct dt_irq *(*dt_irq_get)(struct serial_port *); /* Get serial information */ const struct vuart_info *(*vuart_info)(struct serial_port *); }; @@ -135,9 +133,6 @@ void serial_end_log_everything(int handle); /* Return irq number for specified serial port (identified by index). */ int serial_irq(int idx); -/* Return irq device node for specified serial port (identified by index). */ -const struct dt_irq *serial_dt_irq(int idx); - /* Retrieve basic UART information to emulate it (base address, size...) */ const struct vuart_info* serial_vuart_info(int idx);