public inbox for linux-serial@vger.kernel.org
 help / color / mirror / Atom feed
From: Alan Cox <alan@redhat.com>
To: torvalds@osdl.org, linux-kernel@vger.kernel.org,
	linux-serial@vger.kernel.org
Subject: [PATCH 06/27] Blackfin Serial Driver: Fix bug - should suspend/resume/remove all uart ports.
Date: Fri, 10 Oct 2008 11:48:34 +0100	[thread overview]
Message-ID: <20081010104828.31597.39146.stgit@localhost.localdomain> (raw)
In-Reply-To: <20081010103447.31597.42992.stgit@localhost.localdomain>

From: Sonic Zhang <sonic.zhang@analog.com>

Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
Signed-off-by: Alan Cox <alan@redhat.com>
---

 drivers/serial/bfin_5xx.c |   39 ++++++++++++++++++++++-----------------
 1 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/drivers/serial/bfin_5xx.c b/drivers/serial/bfin_5xx.c
index 4a023c6..04eeef0 100644
--- a/drivers/serial/bfin_5xx.c
+++ b/drivers/serial/bfin_5xx.c
@@ -1100,20 +1100,26 @@ static struct uart_driver bfin_serial_reg = {
 
 static int bfin_serial_suspend(struct platform_device *dev, pm_message_t state)
 {
-	struct bfin_serial_port *uart = platform_get_drvdata(dev);
+	int i;
 
-	if (uart)
-		uart_suspend_port(&bfin_serial_reg, &uart->port);
+	for (i = 0; i < nr_ports; i++) {
+		if (bfin_serial_ports[i].port.dev != &dev->dev)
+			continue;
+		uart_suspend_port(&bfin_serial_reg, &bfin_serial_ports[i].port);
+	}
 
 	return 0;
 }
 
 static int bfin_serial_resume(struct platform_device *dev)
 {
-	struct bfin_serial_port *uart = platform_get_drvdata(dev);
+	int i;
 
-	if (uart)
-		uart_resume_port(&bfin_serial_reg, &uart->port);
+	for (i = 0; i < nr_ports; i++) {
+		if (bfin_serial_ports[i].port.dev != &dev->dev)
+			continue;
+		uart_resume_port(&bfin_serial_reg, &bfin_serial_ports[i].port);
+	}
 
 	return 0;
 }
@@ -1133,27 +1139,26 @@ static int bfin_serial_probe(struct platform_device *dev)
 				continue;
 			bfin_serial_ports[i].port.dev = &dev->dev;
 			uart_add_one_port(&bfin_serial_reg, &bfin_serial_ports[i].port);
-			platform_set_drvdata(dev, &bfin_serial_ports[i]);
 		}
 	}
 
 	return 0;
 }
 
-static int bfin_serial_remove(struct platform_device *pdev)
+static int bfin_serial_remove(struct platform_device *dev)
 {
-	struct bfin_serial_port *uart = platform_get_drvdata(pdev);
-
+	int i;
 
+	for (i = 0; i < nr_ports; i++) {
+		if (bfin_serial_ports[i].port.dev != &dev->dev)
+			continue;
+		uart_remove_one_port(&bfin_serial_reg, &bfin_serial_ports[i].port);
+		bfin_serial_ports[i].port.dev = NULL;
 #ifdef CONFIG_SERIAL_BFIN_CTSRTS
-	gpio_free(uart->cts_pin);
-	gpio_free(uart->rts_pin);
+		gpio_free(bfin_serial_ports[i].cts_pin);
+		gpio_free(bfin_serial_ports[i].rts_pin);
 #endif
-
-	platform_set_drvdata(pdev, NULL);
-
-	if (uart)
-		uart_remove_one_port(&bfin_serial_reg, &uart->port);
+	}
 
 	return 0;
 }


  parent reply	other threads:[~2008-10-10 10:48 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-10-10 10:36 [PATCH 00/27] First block of the tty backlog Alan Cox
2008-10-10 10:36 ` [PATCH 01/27] drivers/serial/crisv10.c: add missing put_tty_driver Alan Cox
2008-10-10 10:36 ` [PATCH 02/27] drivers/char/hvc_console.c: adjust call to put_tty_driver Alan Cox
2008-10-10 10:36 ` [PATCH 03/27] coldfire: scheduled SERIAL_COLDFIRE removal Alan Cox
2008-10-10 10:37 ` [PATCH 04/27] epca: call tty_port_init Alan Cox
2008-10-10 10:48 ` [PATCH 05/27] Blackfin Serial Driver: use __initdata for data, not __init Alan Cox
2008-10-10 10:48 ` Alan Cox [this message]
2008-10-10 10:48 ` [PATCH 07/27] Blackfin Serial Driver: trim trailing whitespace -- no functional changes Alan Cox
2008-10-10 10:48 ` [PATCH 08/27] Blackfin Serial Driver: move common variables out of serial headers and into the serial driver Alan Cox
2008-10-10 10:48 ` [PATCH 09/27] Blackfin Serial Driver: Remove useless stop Alan Cox
2008-10-10 10:49 ` [PATCH 10/27] Blackfin Serial Driver: Fix bug - Don't call tx_stop in tx_transfer Alan Cox
2008-10-10 10:49 ` [PATCH 11/27] Blackfin Serial Driver: Fix bug - ircp fails on sir over Blackfin UART Alan Cox
2008-10-10 10:49 ` [PATCH 12/27] Blackfin Serial Driver: Fix bug - request UART2/3 peripheral mapped interrupts in PIO mode Alan Cox
2008-10-10 10:49 ` [PATCH 13/27] Fix oti6858 debug level Alan Cox
2008-10-10 10:49 ` [PATCH 14/27] Char: cyclades. remove bogus iomap Alan Cox
2008-10-10 10:49 ` [PATCH 15/27] Char: sx, fix io unmapping Alan Cox
2008-10-10 10:50 ` [PATCH 16/27] Char: merge ip2main and ip2base Alan Cox
2008-10-10 10:50 ` [PATCH 17/27] ip2, cleanup globals Alan Cox
2008-10-10 10:50 ` [PATCH 18/27] ip2, fix sparse warnings Alan Cox
2008-10-10 10:50 ` [PATCH 19/27] ip2, init/deinit cleanup Alan Cox
2008-10-10 10:50 ` [PATCH 20/27] ip2: avoid add_timer with pending timer Alan Cox
2008-10-10 10:50 ` [PATCH 21/27] audit: Handle embedded NUL in TTY input auditing Alan Cox
2008-10-10 10:50 ` [PATCH 22/27] serial: Make uart_port's ioport "unsigned long" Alan Cox
2008-10-10 12:54   ` Josh Boyer
2008-10-10 16:19     ` David Miller
2008-10-10 10:51 ` [PATCH 23/27] nozomi: Fix close on error Alan Cox
2008-10-10 10:51 ` [PATCH 24/27] serial-make-uart_ports-ioport-unsigned-long-fix Alan Cox
2008-10-10 10:51 ` [PATCH 25/27] usb: fix pl2303 initialization Alan Cox
2008-10-10 10:51 ` [PATCH 26/27] ftdi: A few errors are err() that should be debug which causes much spewage Alan Cox
2008-10-10 10:52 ` [PATCH 27/27] serial_8250: pci_enable_device fail is not fully handled Alan Cox

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20081010104828.31597.39146.stgit@localhost.localdomain \
    --to=alan@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-serial@vger.kernel.org \
    --cc=torvalds@osdl.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox