* [PATCH 1/3] tty/serial: atmel_serial: change platform_data variable name
@ 2011-10-03 9:46 Nicolas Ferre
2011-10-03 9:46 ` [PATCH 2/3] tty/serial: atmel_serial: whitespace and braces modifications Nicolas Ferre
2011-10-03 9:46 ` [PATCH 3/3] tty/serial: atmel_serial: __devinit_p for probe function Nicolas Ferre
0 siblings, 2 replies; 8+ messages in thread
From: Nicolas Ferre @ 2011-10-03 9:46 UTC (permalink / raw)
To: linux-arm-kernel, alan, linux-serial
Cc: linux-kernel, plagnioj, Nicolas Ferre
Easier to follow if platform_data name is pdata.
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
---
drivers/tty/serial/atmel_serial.c | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/tty/serial/atmel_serial.c b/drivers/tty/serial/atmel_serial.c
index af9b781..08b5273 100644
--- a/drivers/tty/serial/atmel_serial.c
+++ b/drivers/tty/serial/atmel_serial.c
@@ -1414,13 +1414,13 @@ static void __devinit atmel_init_port(struct atmel_uart_port *atmel_port,
struct platform_device *pdev)
{
struct uart_port *port = &atmel_port->uart;
- struct atmel_uart_data *data = pdev->dev.platform_data;
+ struct atmel_uart_data *pdata = pdev->dev.platform_data;
port->iotype = UPIO_MEM;
port->flags = UPF_BOOT_AUTOCONF;
port->ops = &atmel_pops;
port->fifosize = 1;
- port->line = data->num;
+ port->line = pdata->num;
port->dev = &pdev->dev;
port->mapbase = pdev->resource[0].start;
port->irq = pdev->resource[1].start;
@@ -1430,9 +1430,9 @@ static void __devinit atmel_init_port(struct atmel_uart_port *atmel_port,
memset(&atmel_port->rx_ring, 0, sizeof(atmel_port->rx_ring));
- if (data->regs)
+ if (pdata->regs)
/* Already mapped by setup code */
- port->membase = data->regs;
+ port->membase = pdata->regs;
else {
port->flags |= UPF_IOREMAP;
port->membase = NULL;
@@ -1447,9 +1447,9 @@ static void __devinit atmel_init_port(struct atmel_uart_port *atmel_port,
/* only enable clock when USART is in use */
}
- atmel_port->use_dma_rx = data->use_dma_rx;
- atmel_port->use_dma_tx = data->use_dma_tx;
- atmel_port->rs485 = data->rs485;
+ atmel_port->use_dma_rx = pdata->use_dma_rx;
+ atmel_port->use_dma_tx = pdata->use_dma_tx;
+ atmel_port->rs485 = pdata->rs485;
/* Use TXEMPTY for interrupt when rs485 else TXRDY or ENDTX|TXBUFE */
if (atmel_port->rs485.flags & SER_RS485_ENABLED)
atmel_port->tx_done_mask = ATMEL_US_TXEMPTY;
--
1.7.3
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 2/3] tty/serial: atmel_serial: whitespace and braces modifications
2011-10-03 9:46 [PATCH 1/3] tty/serial: atmel_serial: change platform_data variable name Nicolas Ferre
@ 2011-10-03 9:46 ` Nicolas Ferre
2011-10-03 9:46 ` [PATCH 3/3] tty/serial: atmel_serial: __devinit_p for probe function Nicolas Ferre
1 sibling, 0 replies; 8+ messages in thread
From: Nicolas Ferre @ 2011-10-03 9:46 UTC (permalink / raw)
To: linux-arm-kernel, alan, linux-serial
Cc: Nicolas Ferre, plagnioj, linux-kernel
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
---
drivers/tty/serial/atmel_serial.c | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/drivers/tty/serial/atmel_serial.c b/drivers/tty/serial/atmel_serial.c
index 08b5273..a652f8f 100644
--- a/drivers/tty/serial/atmel_serial.c
+++ b/drivers/tty/serial/atmel_serial.c
@@ -1430,10 +1430,10 @@ static void __devinit atmel_init_port(struct atmel_uart_port *atmel_port,
memset(&atmel_port->rx_ring, 0, sizeof(atmel_port->rx_ring));
- if (pdata->regs)
+ if (pdata->regs) {
/* Already mapped by setup code */
port->membase = pdata->regs;
- else {
+ } else {
port->flags |= UPF_IOREMAP;
port->membase = NULL;
}
@@ -1447,9 +1447,10 @@ static void __devinit atmel_init_port(struct atmel_uart_port *atmel_port,
/* only enable clock when USART is in use */
}
- atmel_port->use_dma_rx = pdata->use_dma_rx;
- atmel_port->use_dma_tx = pdata->use_dma_tx;
+ atmel_port->use_dma_rx = pdata->use_dma_rx;
+ atmel_port->use_dma_tx = pdata->use_dma_tx;
atmel_port->rs485 = pdata->rs485;
+
/* Use TXEMPTY for interrupt when rs485 else TXRDY or ENDTX|TXBUFE */
if (atmel_port->rs485.flags & SER_RS485_ENABLED)
atmel_port->tx_done_mask = ATMEL_US_TXEMPTY;
--
1.7.3
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 3/3] tty/serial: atmel_serial: __devinit_p for probe function
2011-10-03 9:46 [PATCH 1/3] tty/serial: atmel_serial: change platform_data variable name Nicolas Ferre
2011-10-03 9:46 ` [PATCH 2/3] tty/serial: atmel_serial: whitespace and braces modifications Nicolas Ferre
@ 2011-10-03 9:46 ` Nicolas Ferre
2011-10-03 8:50 ` Russell King - ARM Linux
[not found] ` <b371e80a96a36d962fb8806c2bd7aa20bb688b88.1317636473.git.nicolas.ferre@atmel.com>
1 sibling, 2 replies; 8+ messages in thread
From: Nicolas Ferre @ 2011-10-03 9:46 UTC (permalink / raw)
To: linux-arm-kernel, alan, linux-serial
Cc: linux-kernel, plagnioj, Nicolas Ferre
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
---
drivers/tty/serial/atmel_serial.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/tty/serial/atmel_serial.c b/drivers/tty/serial/atmel_serial.c
index a652f8f..453cdb5 100644
--- a/drivers/tty/serial/atmel_serial.c
+++ b/drivers/tty/serial/atmel_serial.c
@@ -1789,7 +1789,7 @@ static int __devexit atmel_serial_remove(struct platform_device *pdev)
}
static struct platform_driver atmel_serial_driver = {
- .probe = atmel_serial_probe,
+ .probe = __devexit_p(atmel_serial_probe),
.remove = __devexit_p(atmel_serial_remove),
.suspend = atmel_serial_suspend,
.resume = atmel_serial_resume,
--
1.7.3
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH 3/3] tty/serial: atmel_serial: __devinit_p for probe function
2011-10-03 9:46 ` [PATCH 3/3] tty/serial: atmel_serial: __devinit_p for probe function Nicolas Ferre
@ 2011-10-03 8:50 ` Russell King - ARM Linux
2011-10-03 8:56 ` Nicolas Ferre
[not found] ` <b371e80a96a36d962fb8806c2bd7aa20bb688b88.1317636473.git.nicolas.ferre@atmel.com>
1 sibling, 1 reply; 8+ messages in thread
From: Russell King - ARM Linux @ 2011-10-03 8:50 UTC (permalink / raw)
To: Nicolas Ferre
Cc: linux-kernel, plagnioj, linux-serial, linux-arm-kernel, alan
On Mon, Oct 03, 2011 at 11:46:16AM +0200, Nicolas Ferre wrote:
> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
> ---
> drivers/tty/serial/atmel_serial.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/tty/serial/atmel_serial.c b/drivers/tty/serial/atmel_serial.c
> index a652f8f..453cdb5 100644
> --- a/drivers/tty/serial/atmel_serial.c
> +++ b/drivers/tty/serial/atmel_serial.c
> @@ -1789,7 +1789,7 @@ static int __devexit atmel_serial_remove(struct platform_device *pdev)
> }
>
> static struct platform_driver atmel_serial_driver = {
> - .probe = atmel_serial_probe,
> + .probe = __devexit_p(atmel_serial_probe),
That doesn't match the patch description (and is probably wrong.)
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH 3/3] tty/serial: atmel_serial: __devinit_p for probe function
2011-10-03 8:50 ` Russell King - ARM Linux
@ 2011-10-03 8:56 ` Nicolas Ferre
0 siblings, 0 replies; 8+ messages in thread
From: Nicolas Ferre @ 2011-10-03 8:56 UTC (permalink / raw)
To: Russell King - ARM Linux
Cc: linux-arm-kernel, alan, linux-serial, plagnioj, linux-kernel
On 10/03/2011 10:50 AM, Russell King - ARM Linux :
> On Mon, Oct 03, 2011 at 11:46:16AM +0200, Nicolas Ferre wrote:
>> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
>> ---
>> drivers/tty/serial/atmel_serial.c | 2 +-
>> 1 files changed, 1 insertions(+), 1 deletions(-)
>>
>> diff --git a/drivers/tty/serial/atmel_serial.c b/drivers/tty/serial/atmel_serial.c
>> index a652f8f..453cdb5 100644
>> --- a/drivers/tty/serial/atmel_serial.c
>> +++ b/drivers/tty/serial/atmel_serial.c
>> @@ -1789,7 +1789,7 @@ static int __devexit atmel_serial_remove(struct platform_device *pdev)
>> }
>>
>> static struct platform_driver atmel_serial_driver = {
>> - .probe = atmel_serial_probe,
>> + .probe = __devexit_p(atmel_serial_probe),
>
> That doesn't match the patch description (and is probably wrong.)
Yes, indeed.
Sorry for the noise!
--
Nicolas Ferre
^ permalink raw reply [flat|nested] 8+ messages in thread
[parent not found: <b371e80a96a36d962fb8806c2bd7aa20bb688b88.1317636473.git.nicolas.ferre@atmel.com>]
* [PATCH 3/3] tty/serial: atmel_serial: __devinit_p for probe function
[not found] ` <b371e80a96a36d962fb8806c2bd7aa20bb688b88.1317636473.git.nicolas.ferre@atmel.com>
@ 2011-10-03 10:11 ` Nicolas Ferre
2011-10-03 9:36 ` Arnd Bergmann
0 siblings, 1 reply; 8+ messages in thread
From: Nicolas Ferre @ 2011-10-03 10:11 UTC (permalink / raw)
To: linux-arm-kernel, alan, linux-serial
Cc: linux-kernel, plagnioj, Nicolas Ferre
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
---
drivers/tty/serial/atmel_serial.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/tty/serial/atmel_serial.c b/drivers/tty/serial/atmel_serial.c
index a652f8f..e40a10a 100644
--- a/drivers/tty/serial/atmel_serial.c
+++ b/drivers/tty/serial/atmel_serial.c
@@ -1789,7 +1789,7 @@ static int __devexit atmel_serial_remove(struct platform_device *pdev)
}
static struct platform_driver atmel_serial_driver = {
- .probe = atmel_serial_probe,
+ .probe = __devinit_p(atmel_serial_probe),
.remove = __devexit_p(atmel_serial_remove),
.suspend = atmel_serial_suspend,
.resume = atmel_serial_resume,
--
1.7.3
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH 3/3] tty/serial: atmel_serial: __devinit_p for probe function
2011-10-03 10:11 ` Nicolas Ferre
@ 2011-10-03 9:36 ` Arnd Bergmann
2011-10-03 9:49 ` Nicolas Ferre
0 siblings, 1 reply; 8+ messages in thread
From: Arnd Bergmann @ 2011-10-03 9:36 UTC (permalink / raw)
To: linux-arm-kernel
Cc: Nicolas Ferre, alan, linux-serial, plagnioj, linux-kernel
On Monday 03 October 2011 12:11:19 Nicolas Ferre wrote:
> }
>
> static struct platform_driver atmel_serial_driver = {
> - .probe = atmel_serial_probe,
> + .probe = __devinit_p(atmel_serial_probe),
> .remove = __devexit_p(atmel_serial_remove),
> .suspend = atmel_serial_suspend,
> .resume = atmel_serial_resume,
Still wrong: __devinit_p does not exist and is not needed.
What bug are you trying to fix here?
Arnd
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH 3/3] tty/serial: atmel_serial: __devinit_p for probe function
2011-10-03 9:36 ` Arnd Bergmann
@ 2011-10-03 9:49 ` Nicolas Ferre
0 siblings, 0 replies; 8+ messages in thread
From: Nicolas Ferre @ 2011-10-03 9:49 UTC (permalink / raw)
To: Arnd Bergmann
Cc: linux-arm-kernel, alan, linux-serial, plagnioj, linux-kernel,
Russell King - ARM Linux
On 10/03/2011 11:36 AM, Arnd Bergmann :
> On Monday 03 October 2011 12:11:19 Nicolas Ferre wrote:
>> }
>>
>> static struct platform_driver atmel_serial_driver = {
>> - .probe = atmel_serial_probe,
>> + .probe = __devinit_p(atmel_serial_probe),
>> .remove = __devexit_p(atmel_serial_remove),
>> .suspend = atmel_serial_suspend,
>> .resume = atmel_serial_resume,
>
> Still wrong: __devinit_p does not exist and is not needed.
OMG, the not-enouth-coffee syndrome... twice!
So we forget all this and I try to increase my signal/noise ratio ;-)
Bye,
--
Nicolas Ferre
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2011-10-03 9:49 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-10-03 9:46 [PATCH 1/3] tty/serial: atmel_serial: change platform_data variable name Nicolas Ferre
2011-10-03 9:46 ` [PATCH 2/3] tty/serial: atmel_serial: whitespace and braces modifications Nicolas Ferre
2011-10-03 9:46 ` [PATCH 3/3] tty/serial: atmel_serial: __devinit_p for probe function Nicolas Ferre
2011-10-03 8:50 ` Russell King - ARM Linux
2011-10-03 8:56 ` Nicolas Ferre
[not found] ` <b371e80a96a36d962fb8806c2bd7aa20bb688b88.1317636473.git.nicolas.ferre@atmel.com>
2011-10-03 10:11 ` Nicolas Ferre
2011-10-03 9:36 ` Arnd Bergmann
2011-10-03 9:49 ` Nicolas Ferre
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).