Subject: [PATCH] tty/serial: at91: Use atmel_port consistently

From: [email-masked] (Nicolas Ferre)
Date: Tue, 26 Jan 2016 12:01:51 +0100

Le 25/01/2016 18:29, Nicolas Ferre a ?crit :
> Le 15/01/2016 01:21, Kyle Roeschley a ?crit :
>> From: Jaeden Amero <[email-masked]>
>>
>> In all functions other than atmel_serial_probe_fifos,
>> atmel_serial_probe, and atmel_console_init, the name "port" is used to
>> refer to an instance of struct uart_port. In many of these functions,
>> "atmel_port" is used to refer to an instance of struct atmel_uart_port.
>>
>> We make the use of the name "port" consistent by making
>> atmel_serial_probe_fifos, atmel_serial_probe, and atmel_console_init
>> use "atmel_port" to refer to an instance of struct atmel_uart_port
>> instead of the previous name of "port".
>>
>> Signed-off-by: Jaeden Amero <[email-masked]>
>> Signed-off-by: Kyle Roeschley <[email-masked]>
>> Acked-by: Karthik Manamcheri <[email-masked]>
> 
> I agree with this as this rename is useful and prevents confusion.
> 
> Acked-by: Nicolas Ferre <[email-masked]>
> 
> Thanks, bye.
> 
>> ---
>>  drivers/tty/serial/atmel_serial.c | 81 ++++++++++++++++++++-------------------
>>  1 file changed, 41 insertions(+), 40 deletions(-)
>>
>> diff --git a/drivers/tty/serial/atmel_serial.c b/drivers/tty/serial/atmel_serial.c
>> index 1c0884d..a809119 100644
>> --- a/drivers/tty/serial/atmel_serial.c
>> +++ b/drivers/tty/serial/atmel_serial.c
>> @@ -2478,13 +2478,13 @@ static int __init atmel_console_init(void)
>>  		struct atmel_uart_data *pdata =
>>  			dev_get_platdata(&atmel_default_console_device->dev);
>>  		int id = pdata->num;
>> -		struct atmel_uart_port *port = &atmel_ports[id];
>> +		struct atmel_uart_port *atmel_port = &atmel_ports[id];
>>  
>> -		port->backup_imr = 0;
>> -		port->uart.line = id;
>> +		atmel_port->backup_imr = 0;
>> +		atmel_port->uart.line = id;
>>  
>>  		add_preferred_console(ATMEL_DEVICENAME, id, NULL);
>> -		ret = atmel_init_port(port, atmel_default_console_device);
>> +		ret = atmel_init_port(atmel_port, atmel_default_console_device);
>>  		if (ret)
>>  			return ret;
>>  		register_console(&atmel_console);
>> @@ -2599,23 +2599,23 @@ static int atmel_serial_resume(struct platform_device *pdev)
>>  #define atmel_serial_resume NULL
>>  #endif
>>  
>> -static void atmel_serial_probe_fifos(struct atmel_uart_port *port,
>> +static void atmel_serial_probe_fifos(struct atmel_uart_port *atmel_port,
>>  				     struct platform_device *pdev)
>>  {
>> -	port->fifo_size = 0;
>> -	port->rts_low = 0;
>> -	port->rts_high = 0;
>> +	atmel_port->fifo_size = 0;
>> +	atmel_port->rts_low = 0;
>> +	atmel_port->rts_high = 0;
>>  
>>  	if (of_property_read_u32(pdev->dev.of_node,
>>  				 "atmel,fifo-size",
>> -				 &port->fifo_size))
>> +				 &atmel_port->fifo_size))
>>  		return;
>>  
>> -	if (!port->fifo_size)
>> +	if (!atmel_port->fifo_size)
>>  		return;
>>  
>> -	if (port->fifo_size < ATMEL_MIN_FIFO_SIZE) {
>> -		port->fifo_size = 0;
>> +	if (atmel_port->fifo_size < ATMEL_MIN_FIFO_SIZE) {
>> +		atmel_port->fifo_size = 0;
>>  		dev_err(&pdev->dev, "Invalid FIFO size\n");
>>  		return;
>>  	}
>> @@ -2628,22 +2628,22 @@ static void atmel_serial_probe_fifos(struct atmel_uart_port *port,
>>  	 * Threshold to a reasonably high value respecting this 16 data
>>  	 * empirical rule when possible.
>>  	 */
>> -	port->rts_high = max_t(int, port->fifo_size >> 1,
>> -			       port->fifo_size - ATMEL_RTS_HIGH_OFFSET);
>> -	port->rts_low  = max_t(int, port->fifo_size >> 2,
>> -			       port->fifo_size - ATMEL_RTS_LOW_OFFSET);
>> +	atmel_port->rts_high = max_t(int, atmel_port->fifo_size >> 1,
>> +			       atmel_port->fifo_size - ATMEL_RTS_HIGH_OFFSET);
>> +	atmel_port->rts_low  = max_t(int, atmel_port->fifo_size >> 2,
>> +			       atmel_port->fifo_size - ATMEL_RTS_LOW_OFFSET);
>>  
>>  	dev_info(&pdev->dev, "Using FIFO (%u data)\n",
>> -		 port->fifo_size);
>> +		 atmel_port->fifo_size);
>>  	dev_dbg(&pdev->dev, "RTS High Threshold : %2u data\n",
>> -		port->rts_high);
>> +		atmel_port->rts_high);
>>  	dev_dbg(&pdev->dev, "RTS Low Threshold  : %2u data\n",
>> -		port->rts_low);
>> +		atmel_port->rts_low);
>>  }
>>  
>>  static int atmel_serial_probe(struct platform_device *pdev)
>>  {
>> -	struct atmel_uart_port *port;
>> +	struct atmel_uart_port *atmel_port;
>>  	struct device_node *np = pdev->dev.of_node;
>>  	struct atmel_uart_data *pdata = dev_get_platdata(&pdev->dev);
>>  	void *data;
>> @@ -2674,14 +2674,14 @@ static int atmel_serial_probe(struct platform_device *pdev)
>>  		goto err;
>>  	}
>>  
>> -	port = &atmel_ports[ret];
>> -	port->backup_imr = 0;
>> -	port->uart.line = ret;
>> -	atmel_serial_probe_fifos(port, pdev);
>> +	ateml_port = &atmel_ports[ret];

Actually, there's a typo here ^ : s/ateml/atmel/

I re-send a v2 patch right now.

Bye,

>> +	atmel_port->backup_imr = 0;
>> +	atmel_port->uart.line = ret;
>> +	atmel_serial_probe_fifos(atmel_port, pdev);
>>  
>> -	spin_lock_init(&port->lock_suspended);
>> +	spin_lock_init(&atmel_port->lock_suspended);
>>  
>> -	ret = atmel_init_port(port, pdev);
>> +	ret = atmel_init_port(atmel_port, pdev);
>>  	if (ret)
>>  		goto err_clear_bit;
>>  
>> @@ -2691,34 +2691,34 @@ static int atmel_serial_probe(struct platform_device *pdev)
>>  		goto err_clear_bit;
>>  	}
>>  
>> -	if (!atmel_use_pdc_rx(&port->uart)) {
>> +	if (!atmel_use_pdc_rx(&atmel_port->uart)) {
>>  		ret = -ENOMEM;
>>  		data = kmalloc(sizeof(struct atmel_uart_char)
>>  				* ATMEL_SERIAL_RINGSIZE, GFP_KERNEL);
>>  		if (!data)
>>  			goto err_alloc_ring;
>> -		port->rx_ring.buf = data;
>> +		atmel_port->rx_ring.buf = data;
>>  	}
>>  
>> -	rs485_enabled = port->uart.rs485.flags & SER_RS485_ENABLED;
>> +	rs485_enabled = atmel_port->uart.rs485.flags & SER_RS485_ENABLED;
>>  
>> -	ret = uart_add_one_port(&atmel_uart, &port->uart);
>> +	ret = uart_add_one_port(&atmel_uart, &atmel_port->uart);
>>  	if (ret)
>>  		goto err_add_port;
>>  
>>  #ifdef CONFIG_SERIAL_ATMEL_CONSOLE
>> -	if (atmel_is_console_port(&port->uart)
>> +	if (atmel_is_console_port(&atmel_port->uart)
>>  			&& ATMEL_CONSOLE_DEVICE->flags & CON_ENABLED) {
>>  		/*
>>  		 * The serial core enabled the clock for us, so undo
>>  		 * the clk_prepare_enable() in atmel_console_setup()
>>  		 */
>> -		clk_disable_unprepare(port->clk);
>> +		clk_disable_unprepare(atmel_port->clk);
>>  	}
>>  #endif
>>  
>>  	device_init_wakeup(&pdev->dev, 1);
>> -	platform_set_drvdata(pdev, port);
>> +	platform_set_drvdata(pdev, atmel_port);
>>  
>>  	/*
>>  	 * The peripheral clock has been disabled by atmel_init_port():
>> @@ -2727,9 +2727,10 @@ static int atmel_serial_probe(struct platform_device *pdev)
>>  	clk_prepare_enable(port->clk);
>>  
>>  	if (rs485_enabled) {
>> -		atmel_uart_writel(&port->uart, ATMEL_US_MR,
>> +		atmel_uart_writel(&atmel_port->uart, ATMEL_US_MR,
>>  				  ATMEL_US_USMODE_NORMAL);
>> -		atmel_uart_writel(&port->uart, ATMEL_US_CR, ATMEL_US_RTSEN);
>> +		atmel_uart_writel(&atmel_port->uart, ATMEL_US_CR,
>> +				  ATMEL_US_RTSEN);
>>  	}
>>  
>>  	/*
>> @@ -2746,12 +2747,12 @@ static int atmel_serial_probe(struct platform_device *pdev)
>>  	return 0;
>>  
>>  err_add_port:
>> -	kfree(port->rx_ring.buf);
>> -	port->rx_ring.buf = NULL;
>> +	kfree(atmel_port->rx_ring.buf);
>> +	atmel_port->rx_ring.buf = NULL;
>>  err_alloc_ring:
>> -	if (!atmel_is_console_port(&port->uart)) {
>> -		clk_put(port->clk);
>> -		port->clk = NULL;
>> +	if (!atmel_is_console_port(&atmel_port->uart)) {
>> +		clk_put(atmel_port->clk);
>> +		atmel_port->clk = NULL;
>>  	}
>>  err_clear_bit:
>>  	clear_bit(port->uart.line, atmel_ports_in_use);
>>
> 
> 

-- 
Nicolas Ferre