From: Julien Grall <julien.grall@linaro.org>
To: xen-devel@lists.xenproject.org
Cc: stefano.stabellini@citrix.com, Keir Fraser <keir@xen.org>,
Julien Grall <julien.grall@linaro.org>,
tim@xen.org, ian.campbell@citrix.com
Subject: [PATCH v2 12/16] xen/serial: remove serial_dt_irq
Date: Thu, 3 Apr 2014 21:42:03 +0100 [thread overview]
Message-ID: <1396557727-19102-13-git-send-email-julien.grall@linaro.org> (raw)
In-Reply-To: <1396557727-19102-1-git-send-email-julien.grall@linaro.org>
This function was only used for ARM IRQ routing which has been removed in an
earlier patch.
Signed-off-by: Julien Grall <julien.grall@linaro.org>
CC: Keir Fraser <keir@xen.org>
---
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);
--
1.7.10.4
next prev parent reply other threads:[~2014-04-03 20:42 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-03 20:41 [PATCH v2 00/16] Interrupt management reworking Julien Grall
2014-04-03 20:41 ` [PATCH v2 01/16] xen/arm: timer: replace timer_dt_irq by timer_get_irq Julien Grall
2014-04-07 13:10 ` Ian Campbell
2014-04-07 13:24 ` Julien Grall
2014-04-03 20:41 ` [PATCH v2 02/16] xen/arm: IRQ: Use default irq callback from common code for no_irq_type Julien Grall
2014-04-07 13:10 ` Ian Campbell
2014-04-03 20:41 ` [PATCH v2 03/16] xen/arm: IRQ: Rename irq_cfg into arch_irq_desc Julien Grall
2014-04-07 13:10 ` Ian Campbell
2014-04-03 20:41 ` [PATCH v2 04/16] xen/arm: IRQ: move gic {, un}lock in gic_set_irq_properties Julien Grall
2014-04-03 20:41 ` [PATCH v2 05/16] xen/arm: IRQ: drop irq parameter in __setup_irq Julien Grall
2014-04-07 13:05 ` Ian Campbell
2014-04-07 13:26 ` Julien Grall
2014-04-03 20:41 ` [PATCH v2 06/16] xen/arm: IRQ: remove __init from setup_dt_irq, request_dt_irq and release_irq Julien Grall
2014-04-07 13:11 ` Ian Campbell
2014-04-03 20:41 ` [PATCH v2 07/16] xen/arm: IRQ: Move IRQ management from gic.c to irq.c Julien Grall
2014-04-07 13:07 ` Ian Campbell
2014-04-07 13:34 ` Julien Grall
2014-04-03 20:41 ` [PATCH v2 08/16] xen/arm: IRQ Introduce irq_get_domain Julien Grall
2014-04-07 13:15 ` Ian Campbell
2014-04-07 13:44 ` Julien Grall
2014-04-03 20:42 ` [PATCH v2 09/16] xen/arm: IRQ: Add lock contrainst for gic_irq_{startup, shutdown} Julien Grall
2014-04-07 13:27 ` Ian Campbell
2014-04-07 14:45 ` Julien Grall
2014-04-03 20:42 ` [PATCH v2 10/16] xen/arm: IRQ: Don't need to have a specific function to route IRQ to Xen Julien Grall
2014-04-07 13:53 ` Ian Campbell
2014-04-07 14:15 ` Julien Grall
2014-04-03 20:42 ` [PATCH v2 11/16] xen/arm: IRQ: Protect IRQ to be shared between domains and XEN Julien Grall
2014-04-07 14:46 ` Ian Campbell
2014-04-07 14:53 ` Julien Grall
2014-04-07 15:12 ` Ian Campbell
2014-04-07 15:32 ` Julien Grall
2014-04-03 20:42 ` Julien Grall [this message]
2014-04-07 14:49 ` [PATCH v2 12/16] xen/serial: remove serial_dt_irq Ian Campbell
2014-04-03 20:42 ` [PATCH v2 13/16] xen/arm: IRQ: Store IRQ type in arch_irq_desc Julien Grall
2014-04-07 15:03 ` Ian Campbell
2014-04-07 16:06 ` Julien Grall
2014-04-07 16:26 ` Ian Campbell
2014-04-08 11:46 ` Julien Grall
2014-04-08 15:30 ` Ian Campbell
2014-04-08 15:50 ` Julien Grall
2014-04-08 15:54 ` Ian Campbell
2014-04-03 20:42 ` [PATCH v2 14/16] xen/arm: IRQ: Replace {request, setup}_dt_irq by {request, setup}_irq Julien Grall
2014-04-07 15:06 ` Ian Campbell
2014-04-07 16:11 ` Julien Grall
2014-04-03 20:42 ` [PATCH v2 15/16] xen: IRQ: Add dev_id parameter to release_irq Julien Grall
2014-04-04 7:47 ` Jan Beulich
2014-04-04 8:39 ` Julien Grall
2014-04-07 15:08 ` Ian Campbell
2014-04-03 20:42 ` [PATCH v2 16/16] xen/arm: IRQ: Handle multiple action per IRQ Julien Grall
2014-04-04 7:59 ` Jan Beulich
2014-04-04 8:52 ` Julien Grall
2014-04-04 9:00 ` Jan Beulich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1396557727-19102-13-git-send-email-julien.grall@linaro.org \
--to=julien.grall@linaro.org \
--cc=ian.campbell@citrix.com \
--cc=keir@xen.org \
--cc=stefano.stabellini@citrix.com \
--cc=tim@xen.org \
--cc=xen-devel@lists.xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).