From patchwork Fri Jan 24 16:43:42 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 23688 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pa0-f72.google.com (mail-pa0-f72.google.com [209.85.220.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id C1E03203C5 for ; Fri, 24 Jan 2014 16:44:03 +0000 (UTC) Received: by mail-pa0-f72.google.com with SMTP id rd3sf8157116pab.7 for ; Fri, 24 Jan 2014 08:44:02 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=IvyzpqJZz1Ss41HeXdwJ+aVKTox/gU2ewnyy2jfjCfA=; b=RGuySSVIqP8ucKKFLKMExC4klAqqKtQ5CAgXsST384LsJ1NuPYjsFC6xI97ZNkRMl7 PpEceGwtamwQ1qNrGpFBtc5YN8HwtFXW4PI1xjZJI6s4RKxTzJidG+xQrJTuDcWJ562f PF7DLH3pCxiAMYaKQ9dL5TKwqsre1U1SWLsFQvcPy0IyJ/X5mSkEWuMdxu92BIzpygP7 MAWUVI/3W3w857/sb67Pf1opsM+Z1zeHivAwNQL9lC51tNPSJtmQwtds7VVMI6m6fK+1 twDDxJeZ+/3D8ZaVfN+2PG4lOp1+0f+MlUl4zBdbbns8B4uGUb1/mirhur+328x2vF6S VWRQ== X-Gm-Message-State: ALoCoQla0FWlzRD2162A29OuZlSrKqmGSpxlljnRXc5dHYD8ngurczPmULOrSwKDe+2ShJ4CKbg5 X-Received: by 10.66.221.137 with SMTP id qe9mr5724660pac.4.1390581842824; Fri, 24 Jan 2014 08:44:02 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.22.106 with SMTP id 97ls686687qgm.29.gmail; Fri, 24 Jan 2014 08:44:02 -0800 (PST) X-Received: by 10.58.161.46 with SMTP id xp14mr650357veb.37.1390581842632; Fri, 24 Jan 2014 08:44:02 -0800 (PST) Received: from mail-vb0-f43.google.com (mail-vb0-f43.google.com [209.85.212.43]) by mx.google.com with ESMTPS id dp3si807688vcb.96.2014.01.24.08.44.02 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 24 Jan 2014 08:44:02 -0800 (PST) Received-SPF: neutral (google.com: 209.85.212.43 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.212.43; Received: by mail-vb0-f43.google.com with SMTP id p5so2009967vbn.30 for ; Fri, 24 Jan 2014 08:44:02 -0800 (PST) X-Received: by 10.58.69.20 with SMTP id a20mr8282133veu.0.1390581842548; Fri, 24 Jan 2014 08:44:02 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp115791vcz; Fri, 24 Jan 2014 08:44:01 -0800 (PST) X-Received: by 10.15.49.193 with SMTP id j41mr13381939eew.10.1390581841463; Fri, 24 Jan 2014 08:44:01 -0800 (PST) Received: from mail-ea0-f181.google.com (mail-ea0-f181.google.com [209.85.215.181]) by mx.google.com with ESMTPS id q43si3178341eeo.138.2014.01.24.08.44.00 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 24 Jan 2014 08:44:01 -0800 (PST) Received-SPF: neutral (google.com: 209.85.215.181 is neither permitted nor denied by best guess record for domain of julien.grall@linaro.org) client-ip=209.85.215.181; Received: by mail-ea0-f181.google.com with SMTP id m10so1111669eaj.12 for ; Fri, 24 Jan 2014 08:44:00 -0800 (PST) X-Received: by 10.14.246.194 with SMTP id q42mr399030eer.35.1390581840000; Fri, 24 Jan 2014 08:44:00 -0800 (PST) Received: from belegaer.uk.xensource.com. ([185.25.64.249]) by mx.google.com with ESMTPSA id k41sm5521285eey.0.2014.01.24.08.43.58 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 24 Jan 2014 08:43:59 -0800 (PST) From: Julien Grall To: xen-devel@lists.xenproject.org Cc: patches@linaro.org, ian.campbell@citrix.com, tim@xen.org, stefano.stabellini@citrix.com, Julien Grall , Keir Fraser Subject: [PATCH for-4.5 8/8] xen/serial: remove serial_dt_irq Date: Fri, 24 Jan 2014 16:43:42 +0000 Message-Id: <1390581822-32624-9-git-send-email-julien.grall@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1390581822-32624-1-git-send-email-julien.grall@linaro.org> References: <1390581822-32624-1-git-send-email-julien.grall@linaro.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.212.43 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 Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , This function was only used for IRQ routing which has been removed in an earlier patch. Signed-off-by: Julien Grall CC: Keir Fraser Acked-by: Ian Campbell --- 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 74ac33d..9179138 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 e7cb0ba..ca16d48 100644 --- a/xen/drivers/char/ns16550.c +++ b/xen/drivers/char/ns16550.c @@ -446,14 +446,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) { @@ -473,9 +465,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 7f21f1f..6d882a3 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 9c2870a..ac9c4f8 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);