Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=c811ab8c2daf6bc2b5761937929a62fa84b18b32
Commit: c811ab8c2daf6bc2b5761937929a62fa84b18b32
Parent: 6433471d33c09d69d029b1c4b7bdd1612c492587
Author: Haavard Skinnemoen <[EMAIL PROTECTED]>
AuthorDate: Fri Feb 8 04:21:08 2008 -0800
Committer: Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Fri Feb 8 09:22:37 2008 -0800
atmel_serial: use container_of instead of direct cast
As pointed out by David Brownell, we really ought to be using container_of
when converting from "struct uart_port *" to "struct atmel_uart_port *".
Signed-off-by: Haavard Skinnemoen <[EMAIL PROTECTED]>
Cc: Andrew Victor <[EMAIL PROTECTED]>
Tested-by: Marc Pignat <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
---
drivers/serial/atmel_serial.c | 40 +++++++++++++++++++++++-----------------
1 files changed, 23 insertions(+), 17 deletions(-)
diff --git a/drivers/serial/atmel_serial.c b/drivers/serial/atmel_serial.c
index e08fe64..8cea606 100644
--- a/drivers/serial/atmel_serial.c
+++ b/drivers/serial/atmel_serial.c
@@ -153,17 +153,23 @@ static struct atmel_uart_port atmel_ports[ATMEL_MAX_UART];
static struct console atmel_console;
#endif
+static inline struct atmel_uart_port *
+to_atmel_uart_port(struct uart_port *uart)
+{
+ return container_of(uart, struct atmel_uart_port, uart);
+}
+
#ifdef CONFIG_SERIAL_ATMEL_PDC
static bool atmel_use_dma_rx(struct uart_port *port)
{
- struct atmel_uart_port *atmel_port = (struct atmel_uart_port *)port;
+ struct atmel_uart_port *atmel_port = to_atmel_uart_port(port);
return atmel_port->use_dma_rx;
}
static bool atmel_use_dma_tx(struct uart_port *port)
{
- struct atmel_uart_port *atmel_port = (struct atmel_uart_port *)port;
+ struct atmel_uart_port *atmel_port = to_atmel_uart_port(port);
return atmel_port->use_dma_tx;
}
@@ -326,7 +332,7 @@ static void
atmel_buffer_rx_char(struct uart_port *port, unsigned int status,
unsigned int ch)
{
- struct atmel_uart_port *atmel_port = (struct atmel_uart_port *)port;
+ struct atmel_uart_port *atmel_port = to_atmel_uart_port(port);
struct circ_buf *ring = &atmel_port->rx_ring;
struct atmel_uart_char *c;
@@ -370,7 +376,7 @@ static void atmel_pdc_rxerr(struct uart_port *port,
unsigned int status)
*/
static void atmel_rx_chars(struct uart_port *port)
{
- struct atmel_uart_port *atmel_port = (struct atmel_uart_port *)port;
+ struct atmel_uart_port *atmel_port = to_atmel_uart_port(port);
unsigned int status, ch;
status = UART_GET_CSR(port);
@@ -450,7 +456,7 @@ static void atmel_tx_chars(struct uart_port *port)
static void
atmel_handle_receive(struct uart_port *port, unsigned int pending)
{
- struct atmel_uart_port *atmel_port = (struct atmel_uart_port *)port;
+ struct atmel_uart_port *atmel_port = to_atmel_uart_port(port);
if (atmel_use_dma_rx(port)) {
/*
@@ -491,7 +497,7 @@ atmel_handle_receive(struct uart_port *port, unsigned int
pending)
static void
atmel_handle_transmit(struct uart_port *port, unsigned int pending)
{
- struct atmel_uart_port *atmel_port = (struct atmel_uart_port *)port;
+ struct atmel_uart_port *atmel_port = to_atmel_uart_port(port);
if (atmel_use_dma_tx(port)) {
/* PDC transmit */
@@ -515,7 +521,7 @@ static void
atmel_handle_status(struct uart_port *port, unsigned int pending,
unsigned int status)
{
- struct atmel_uart_port *atmel_port = (struct atmel_uart_port *)port;
+ struct atmel_uart_port *atmel_port = to_atmel_uart_port(port);
if (pending & (ATMEL_US_RIIC | ATMEL_US_DSRIC | ATMEL_US_DCDIC
| ATMEL_US_CTSIC)) {
@@ -551,7 +557,7 @@ static irqreturn_t atmel_interrupt(int irq, void *dev_id)
*/
static void atmel_tx_dma(struct uart_port *port)
{
- struct atmel_uart_port *atmel_port = (struct atmel_uart_port *)port;
+ struct atmel_uart_port *atmel_port = to_atmel_uart_port(port);
struct circ_buf *xmit = &port->info->xmit;
struct atmel_dma_buffer *pdc = &atmel_port->pdc_tx;
int count;
@@ -593,7 +599,7 @@ static void atmel_tx_dma(struct uart_port *port)
static void atmel_rx_from_ring(struct uart_port *port)
{
- struct atmel_uart_port *atmel_port = (struct atmel_uart_port *)port;
+ struct atmel_uart_port *atmel_port = to_atmel_uart_port(port);
struct circ_buf *ring = &atmel_port->rx_ring;
unsigned int flg;
unsigned int status;
@@ -661,7 +667,7 @@ static void atmel_rx_from_ring(struct uart_port *port)
static void atmel_rx_from_dma(struct uart_port *port)
{
- struct atmel_uart_port *atmel_port = (struct atmel_uart_port *)port;
+ struct atmel_uart_port *atmel_port = to_atmel_uart_port(port);
struct tty_struct *tty = port->info->tty;
struct atmel_dma_buffer *pdc;
int rx_idx = atmel_port->pdc_rx_idx;
@@ -741,7 +747,7 @@ static void atmel_rx_from_dma(struct uart_port *port)
static void atmel_tasklet_func(unsigned long data)
{
struct uart_port *port = (struct uart_port *)data;
- struct atmel_uart_port *atmel_port = (struct atmel_uart_port *)port;
+ struct atmel_uart_port *atmel_port = to_atmel_uart_port(port);
unsigned int status;
unsigned int status_change;
@@ -786,7 +792,7 @@ static void atmel_tasklet_func(unsigned long data)
*/
static int atmel_startup(struct uart_port *port)
{
- struct atmel_uart_port *atmel_port = (struct atmel_uart_port *)port;
+ struct atmel_uart_port *atmel_port = to_atmel_uart_port(port);
int retval;
/*
@@ -896,7 +902,7 @@ static int atmel_startup(struct uart_port *port)
*/
static void atmel_shutdown(struct uart_port *port)
{
- struct atmel_uart_port *atmel_port = (struct atmel_uart_port *)port;
+ struct atmel_uart_port *atmel_port = to_atmel_uart_port(port);
/*
* Ensure everything is stopped.
*/
@@ -953,7 +959,7 @@ static void atmel_shutdown(struct uart_port *port)
static void atmel_serial_pm(struct uart_port *port, unsigned int state,
unsigned int oldstate)
{
- struct atmel_uart_port *atmel_port = (struct atmel_uart_port *)port;
+ struct atmel_uart_port *atmel_port = to_atmel_uart_port(port);
switch (state) {
case 0:
@@ -1425,7 +1431,7 @@ static int atmel_serial_suspend(struct platform_device
*pdev,
pm_message_t state)
{
struct uart_port *port = platform_get_drvdata(pdev);
- struct atmel_uart_port *atmel_port = (struct atmel_uart_port *)port;
+ struct atmel_uart_port *atmel_port = to_atmel_uart_port(port);
if (device_may_wakeup(&pdev->dev)
&& !at91_suspend_entering_slow_clock())
@@ -1441,7 +1447,7 @@ static int atmel_serial_suspend(struct platform_device
*pdev,
static int atmel_serial_resume(struct platform_device *pdev)
{
struct uart_port *port = platform_get_drvdata(pdev);
- struct atmel_uart_port *atmel_port = (struct atmel_uart_port *)port;
+ struct atmel_uart_port *atmel_port = to_atmel_uart_port(port);
if (atmel_port->suspended) {
uart_resume_port(&atmel_uart, port);
@@ -1501,7 +1507,7 @@ err_alloc_ring:
static int __devexit atmel_serial_remove(struct platform_device *pdev)
{
struct uart_port *port = platform_get_drvdata(pdev);
- struct atmel_uart_port *atmel_port = (struct atmel_uart_port *)port;
+ struct atmel_uart_port *atmel_port = to_atmel_uart_port(port);
int ret = 0;
device_init_wakeup(&pdev->dev, 0);
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
