Re: [PATCH 18/19] serial: sh-sci: Remove unused platform data capabilities field

[Laurent Pinchart]

Hi Geert,

On Friday 06 Jan 2017 11:59:58 Geert Uytterhoeven wrote:
> On Wed, Jan 4, 2017 at 12:06 AM, Laurent Pinchart wrote:
> > The field isn't set by any platform but is only used internally in the
> > driver to hold data parsed from DT. Move it to the sci_port structure.
> 
> This does mean legacy platform data can no longer set it
> (no platform data did).

Correct. Platforms that want to set it should migrate to DT :-)

> > Signed-off-by: Laurent Pinchart
> > 
> 
> Reviewed-by: Geert Uytterhoeven 

-- 
Regards,

Laurent Pinchart

Re: [PATCH 18/19] serial: sh-sci: Remove unused platform data capabilities field

[Geert Uytterhoeven]

Hi Laurent,

On Wed, Jan 4, 2017 at 12:06 AM, Laurent Pinchart
 wrote:
> The field isn't set by any platform but is only used internally in the
> driver to hold data parsed from DT. Move it to the sci_port structure.

This does mean legacy platform data can no longer set it
(no platform data did).

> Signed-off-by: Laurent Pinchart 

Reviewed-by: Geert Uytterhoeven 

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- ge...@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds

[PATCH 18/19] serial: sh-sci: Remove unused platform data capabilities field

[Laurent Pinchart]

The field isn't set by any platform but is only used internally in the
driver to hold data parsed from DT. Move it to the sci_port structure.

Signed-off-by: Laurent Pinchart 
---
 drivers/tty/serial/sh-sci.c | 11 +++
 include/linux/serial_sci.h  |  6 --
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c
index 1f3025f2d21d..5fc2606fc525 100644
--- a/drivers/tty/serial/sh-sci.c
+++ b/drivers/tty/serial/sh-sci.c
@@ -149,6 +149,7 @@ struct sci_port {
unsigned intrx_timeout;
 #endif
 
+   bool has_rtscts;
bool autorts;
 };
 
@@ -681,7 +682,7 @@ static void sci_init_pins(struct uart_port *port, unsigned 
int cflag)
 
/* Enable RXD and TXD pin functions */
ctrl &= ~(SCPCR_RXDC | SCPCR_TXDC);
-   if (to_sci_port(port)->cfg->capabilities & SCIx_HAVE_RTSCTS) {
+   if (to_sci_port(port)->has_rtscts) {
/* RTS# is output, driven 1 */
ctrl |= SCPCR_RTSC;
serial_port_out(port, SCPDR,
@@ -1737,7 +1738,7 @@ static void sci_set_mctrl(struct uart_port *port, 
unsigned int mctrl)
 
mctrl_gpio_set(s->gpios, mctrl);
 
-   if (!(s->cfg->capabilities & SCIx_HAVE_RTSCTS))
+   if (!s->has_rtscts)
return;
 
if (!(mctrl & TIOCM_RTS)) {
@@ -2808,6 +2809,7 @@ sci_parse_dt(struct platform_device *pdev, unsigned int 
*dev_id)
struct device_node *np = pdev->dev.of_node;
const struct of_device_id *match;
struct plat_sci_port *p;
+   struct sci_port *sp;
int id;
 
if (!IS_ENABLED(CONFIG_OF) || !np)
@@ -2828,13 +2830,14 @@ sci_parse_dt(struct platform_device *pdev, unsigned int 
*dev_id)
return NULL;
}
 
+   sp = _ports[id];
*dev_id = id;
 
p->type = SCI_OF_TYPE(match->data);
p->regtype = SCI_OF_REGTYPE(match->data);
 
if (of_find_property(np, "uart-has-rtscts", NULL))
-   p->capabilities |= SCIx_HAVE_RTSCTS;
+   sp->has_rtscts = true;
 
return p;
 }
@@ -2862,7 +2865,7 @@ static int sci_probe_single(struct platform_device *dev,
if (IS_ERR(sciport->gpios) && PTR_ERR(sciport->gpios) != -ENOSYS)
return PTR_ERR(sciport->gpios);
 
-   if (p->capabilities & SCIx_HAVE_RTSCTS) {
+   if (sciport->has_rtscts) {
if (!IS_ERR_OR_NULL(mctrl_gpio_to_gpiod(sciport->gpios,
UART_GPIO_CTS)) ||
!IS_ERR_OR_NULL(mctrl_gpio_to_gpiod(sciport->gpios,
diff --git a/include/linux/serial_sci.h b/include/linux/serial_sci.h
index b4419931bf4c..f9a4526f4ec5 100644
--- a/include/linux/serial_sci.h
+++ b/include/linux/serial_sci.h
@@ -44,17 +44,11 @@ struct plat_sci_port_ops {
 };
 
 /*
- * Port-specific capabilities
- */
-#define SCIx_HAVE_RTSCTS   BIT(0)
-
-/*
  * Platform device specific platform_data struct
  */
 struct plat_sci_port {
unsigned inttype;   /* SCI / SCIF / IRDA / HSCIF */
upf_t   flags;  /* UPF_* flags */
-   unsigned long   capabilities;   /* Port features/capabilities */
 
unsigned intsampling_rate;
unsigned intscscr;  /* SCSCR initialization */
-- 
Regards,

Laurent Pinchart