| From 45e3730a5d85f60e96df1ca7d07dc63b3ff8067f Mon Sep 17 00:00:00 2001 |
| From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> |
| Date: Fri, 6 Dec 2013 10:59:18 +0100 |
| Subject: serial: sh-sci: Remove unused GPIO request code |
| |
| The driver requests at initialization time GPIOs passed through platform |
| data. No platform makes use of this feature, remove it. |
| |
| Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> |
| Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| (cherry picked from commit 520402bbc6fe328ae28e08bfc87a2b1eb7f10b2c) |
| (Queued by Simon Horman for v3.14 but not yet in Linus's tree) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/tty/serial/sh-sci.c | 67 --------------------------------------------- |
| include/linux/serial_sci.h | 12 -------- |
| 2 files changed, 79 deletions(-) |
| |
| diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c |
| index d1c444afc405..ce9f02506b3c 100644 |
| --- a/drivers/tty/serial/sh-sci.c |
| +++ b/drivers/tty/serial/sh-sci.c |
| @@ -32,7 +32,6 @@ |
| #include <linux/dma-mapping.h> |
| #include <linux/err.h> |
| #include <linux/errno.h> |
| -#include <linux/gpio.h> |
| #include <linux/init.h> |
| #include <linux/interrupt.h> |
| #include <linux/ioport.h> |
| @@ -79,7 +78,6 @@ struct sci_port { |
| |
| int irqs[SCIx_NR_IRQS]; |
| char *irqstr[SCIx_NR_IRQS]; |
| - char *gpiostr[SCIx_NR_FNS]; |
| |
| struct dma_chan *chan_tx; |
| struct dma_chan *chan_rx; |
| @@ -1153,67 +1151,6 @@ static void sci_free_irq(struct sci_port *port) |
| } |
| } |
| |
| -static const char *sci_gpio_names[SCIx_NR_FNS] = { |
| - "sck", "rxd", "txd", "cts", "rts", |
| -}; |
| - |
| -static const char *sci_gpio_str(unsigned int index) |
| -{ |
| - return sci_gpio_names[index]; |
| -} |
| - |
| -static void sci_init_gpios(struct sci_port *port) |
| -{ |
| - struct uart_port *up = &port->port; |
| - int i; |
| - |
| - if (!port->cfg) |
| - return; |
| - |
| - for (i = 0; i < SCIx_NR_FNS; i++) { |
| - const char *desc; |
| - int ret; |
| - |
| - if (!port->cfg->gpios[i]) |
| - continue; |
| - |
| - desc = sci_gpio_str(i); |
| - |
| - port->gpiostr[i] = kasprintf(GFP_KERNEL, "%s:%s", |
| - dev_name(up->dev), desc); |
| - |
| - /* |
| - * If we've failed the allocation, we can still continue |
| - * on with a NULL string. |
| - */ |
| - if (!port->gpiostr[i]) |
| - dev_notice(up->dev, "%s string allocation failure\n", |
| - desc); |
| - |
| - ret = gpio_request(port->cfg->gpios[i], port->gpiostr[i]); |
| - if (unlikely(ret != 0)) { |
| - dev_notice(up->dev, "failed %s gpio request\n", desc); |
| - |
| - /* |
| - * If we can't get the GPIO for whatever reason, |
| - * no point in keeping the verbose string around. |
| - */ |
| - kfree(port->gpiostr[i]); |
| - } |
| - } |
| -} |
| - |
| -static void sci_free_gpios(struct sci_port *port) |
| -{ |
| - int i; |
| - |
| - for (i = 0; i < SCIx_NR_FNS; i++) |
| - if (port->cfg->gpios[i]) { |
| - gpio_free(port->cfg->gpios[i]); |
| - kfree(port->gpiostr[i]); |
| - } |
| -} |
| - |
| static unsigned int sci_tx_empty(struct uart_port *port) |
| { |
| unsigned short status = serial_port_in(port, SCxSR); |
| @@ -2240,8 +2177,6 @@ static int sci_init_single(struct platform_device *dev, |
| |
| port->dev = &dev->dev; |
| |
| - sci_init_gpios(sci_port); |
| - |
| pm_runtime_enable(&dev->dev); |
| } |
| |
| @@ -2298,8 +2233,6 @@ static int sci_init_single(struct platform_device *dev, |
| |
| static void sci_cleanup_single(struct sci_port *port) |
| { |
| - sci_free_gpios(port); |
| - |
| clk_put(port->iclk); |
| clk_put(port->fclk); |
| |
| diff --git a/include/linux/serial_sci.h b/include/linux/serial_sci.h |
| index c1770a6966c1..efd4727ccd67 100644 |
| --- a/include/linux/serial_sci.h |
| +++ b/include/linux/serial_sci.h |
| @@ -69,17 +69,6 @@ enum { |
| SCIx_MUX_IRQ = SCIx_NR_IRQS, /* special case */ |
| }; |
| |
| -/* Offsets into the sci_port->gpios array */ |
| -enum { |
| - SCIx_SCK, |
| - SCIx_RXD, |
| - SCIx_TXD, |
| - SCIx_CTS, |
| - SCIx_RTS, |
| - |
| - SCIx_NR_FNS, |
| -}; |
| - |
| enum { |
| SCIx_PROBE_REGTYPE, |
| |
| @@ -141,7 +130,6 @@ struct plat_sci_port_ops { |
| struct plat_sci_port { |
| unsigned long mapbase; /* resource base */ |
| unsigned int irqs[SCIx_NR_IRQS]; /* ERI, RXI, TXI, BRI */ |
| - unsigned int gpios[SCIx_NR_FNS]; /* SCK, RXD, TXD, CTS, RTS */ |
| unsigned int type; /* SCI / SCIF / IRDA / HSCIF */ |
| upf_t flags; /* UPF_* flags */ |
| unsigned long capabilities; /* Port features/capabilities */ |
| -- |
| 1.8.5.rc3 |
| |