Re: [PATCH 10/13] tty: serial: omap: remove some dead code

[NeilBrown]

On Wed, 23 Apr 2014 10:35:04 -0500 Nishanth Menon <nm@xxxxxx> wrote:

> On 04/23/2014 09:58 AM, Felipe Balbi wrote:
> > nobody passes a DTR_gpio to this driver, so
> > this code is not necessary.
> > 
> > Signed-off-by: Felipe Balbi <balbi@xxxxxx>
> > ---
> 
> Niel,
> this seems to revert the functionality introduced in
> commit 9574f36fb801035f6ab0fbb1b53ce2c12c17d100
> (OMAP/serial: Add support for driving a GPIO as DTR.)
> 
> would you like to Ack this change?

I have a couple of out-of-tree drivers that use this support.

I hope to get back to working on that code one day and even get those drivers
upstream.  So I would really prefer this code to remain if it isn't causing
any actual problems.

Of course, I can always re-submit it when I need it again, but that it just
extra work all around.

Sorry that I have pushed those drivers already, but sometimes life gets in
the way :-)

Thanks,
NeilBrown


> 
> >  drivers/tty/serial/omap-serial.c | 39 ---------------------------------------
> >  1 file changed, 39 deletions(-)
> > 
> > diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c
> > index b46aaf3..6654682 100644
> > --- a/drivers/tty/serial/omap-serial.c
> > +++ b/drivers/tty/serial/omap-serial.c
> > @@ -163,10 +163,6 @@ struct uart_omap_port {
> >  	u8			wakeups_enabled;
> >  	u32			features;
> >  
> > -	int			DTR_gpio;
> > -	int			DTR_inverted;
> > -	int			DTR_active;
> > -
> >  	struct serial_rs485	rs485;
> >  	int			rts_gpio;
> >  
> > @@ -694,16 +690,6 @@ static void serial_omap_set_mctrl(struct uart_port *port, unsigned int mctrl)
> >  	serial_out(up, UART_MCR, up->mcr);
> >  	pm_runtime_mark_last_busy(up->dev);
> >  	pm_runtime_put_autosuspend(up->dev);
> > -
> > -	if (gpio_is_valid(up->DTR_gpio) &&
> > -	    !!(mctrl & TIOCM_DTR) != up->DTR_active) {
> > -		up->DTR_active = !up->DTR_active;
> > -		if (gpio_cansleep(up->DTR_gpio))
> > -			schedule_work(&up->qos_work);
> > -		else
> > -			gpio_set_value(up->DTR_gpio,
> > -				       up->DTR_active != up->DTR_inverted);
> > -	}
> >  }
> >  
> >  static void serial_omap_break_ctl(struct uart_port *port, int break_state)
> > @@ -847,9 +833,6 @@ static void serial_omap_uart_qos_work(struct work_struct *work)
> >  						qos_work);
> >  
> >  	pm_qos_update_request(&up->pm_qos_request, up->latency);
> > -	if (gpio_is_valid(up->DTR_gpio))
> > -		gpio_set_value_cansleep(up->DTR_gpio,
> > -					up->DTR_active != up->DTR_inverted);
> >  }
> >  
> >  static void
> > @@ -1672,28 +1655,6 @@ static int serial_omap_probe(struct platform_device *pdev)
> >  	if (IS_ERR(base))
> >  		return PTR_ERR(base);
> >  
> > -	if (gpio_is_valid(omap_up_info->DTR_gpio) &&
> > -	    omap_up_info->DTR_present) {
> > -		ret = devm_gpio_request(&pdev->dev, omap_up_info->DTR_gpio,
> > -				"omap-serial");
> > -		if (ret < 0)
> > -			return ret;
> > -		ret = gpio_direction_output(omap_up_info->DTR_gpio,
> > -					    omap_up_info->DTR_inverted);
> > -		if (ret < 0)
> > -			return ret;
> > -	}
> > -
> > -	if (gpio_is_valid(omap_up_info->DTR_gpio) &&
> > -	    omap_up_info->DTR_present) {
> > -		up->DTR_gpio = omap_up_info->DTR_gpio;
> > -		up->DTR_inverted = omap_up_info->DTR_inverted;
> > -	} else {
> > -		up->DTR_gpio = -EINVAL;
> > -	}
> > -
> > -	up->DTR_active = 0;
> > -
> >  	up->dev = &pdev->dev;
> >  	up->port.dev = &pdev->dev;
> >  	up->port.type = PORT_OMAP;
> > 
> 
>

Attachment: signature.asc
Description: PGP signature