From mboxrd@z Thu Jan 1 00:00:00 1970 From: Julien Grall Subject: Re: [PATCH v3 13/18] xen/serial: remove serial_dt_irq Date: Thu, 17 Apr 2014 11:22:53 +0100 Message-ID: <534FAB7D.3090904@linaro.org> References: <1396968247-8768-1-git-send-email-julien.grall@linaro.org> <1396968247-8768-14-git-send-email-julien.grall@linaro.org> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WajT9-0002oO-I3 for xen-devel@lists.xenproject.org; Thu, 17 Apr 2014 10:22:59 +0000 Received: by mail-ee0-f53.google.com with SMTP id b57so471669eek.40 for ; Thu, 17 Apr 2014 03:22:56 -0700 (PDT) In-Reply-To: <1396968247-8768-14-git-send-email-julien.grall@linaro.org> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Julien Grall Cc: Keir Fraser , ian.campbell@citrix.com, tim@xen.org, Ian Jackson , stefano.stabellini@citrix.com, Jan Beulich , xen-devel@lists.xenproject.org List-Id: xen-devel@lists.xenproject.org Hi, As it's part of the "REST" category. Do I need a second ack here? Regards, On 04/08/2014 03:44 PM, Julien Grall wrote: > 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); > > -- Julien Grall