From: <shubhrajyoti.datta@gmail.com>
To: <linux-serial@vger.kernel.org>, <linux-kernel@vger.kernel.org>
Cc: <gregkh@linuxfoundation.org>, <jslaby@suse.com>,
<jacmet@sunsite.dk>,
Shubhrajyoti Datta <shubhrajyoti.datta@xilinx.com>,
Michal Simek <michal.simek@xilinx.com>
Subject: [LINUX PATCHv3 6/9] serial-uartlite: Change logic how console_port is setup
Date: Tue, 16 Oct 2018 15:48:05 +0530 [thread overview]
Message-ID: <1539685088-13465-7-git-send-email-shubhrajyoti.datta@gmail.com> (raw)
In-Reply-To: <1539685088-13465-1-git-send-email-shubhrajyoti.datta@gmail.com>
From: Shubhrajyoti Datta <shubhrajyoti.datta@xilinx.com>
Change logic how console_port is setup by using CON_ENABLED flag
instead of index. There will be unique uart_console
structure that's why code can't use id for console_port
assignment.
Signed-off-by: Shubhrajyoti Datta <shubhrajyoti.datta@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---
drivers/tty/serial/uartlite.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/drivers/tty/serial/uartlite.c b/drivers/tty/serial/uartlite.c
index 4a7989d..9c99a1d9 100644
--- a/drivers/tty/serial/uartlite.c
+++ b/drivers/tty/serial/uartlite.c
@@ -665,7 +665,7 @@ static int ulite_assign(struct device *dev, int id, u32 base, int irq,
* If register_console() don't assign value, then console_port pointer
* is cleanup.
*/
- if (ulite_uart_driver.cons->index == -1)
+ if (!console_port)
console_port = port;
#endif
@@ -680,7 +680,8 @@ static int ulite_assign(struct device *dev, int id, u32 base, int irq,
#ifdef CONFIG_SERIAL_UARTLITE_CONSOLE
/* This is not port which is used for console that's why clean it up */
- if (ulite_uart_driver.cons->index == -1)
+ if (console_port == port &&
+ !(ulite_uart_driver->cons->flags & CON_ENABLED))
console_port = NULL;
#endif
@@ -859,6 +860,11 @@ static int ulite_remove(struct platform_device *pdev)
clk_unprepare(pdata->clk);
rc = ulite_release(&pdev->dev);
+#ifdef CONFIG_SERIAL_UARTLITE_CONSOLE
+ if (console_port == port)
+ console_port = NULL;
+#endif
+
pm_runtime_disable(&pdev->dev);
pm_runtime_set_suspended(&pdev->dev);
pm_runtime_dont_use_autosuspend(&pdev->dev);
--
2.1.1
next prev parent reply other threads:[~2018-10-16 10:20 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-16 10:17 [LINUX PATCHv3 0/9] serial-uartlite: Add support for dynamic allocation shubhrajyoti.datta
2018-10-16 10:18 ` [LINUX PATCHv3 1/9] serial-uartlite: Move the uart register shubhrajyoti.datta
2018-10-16 10:18 ` [LINUX PATCHv3 2/9] serial-uartlite: Add get serial id if not provided shubhrajyoti.datta
2018-10-16 10:18 ` [LINUX PATCHv3 3/9] serial-uartlite: Do not use static struct uart_driver out of probe() shubhrajyoti.datta
2018-10-16 10:18 ` [LINUX PATCHv3 4/9] serial-uartlite: Add runtime support shubhrajyoti.datta
2018-10-16 10:18 ` [LINUX PATCHv3 5/9] serial-uartlite: Fix the unbind path shubhrajyoti.datta
2018-10-16 10:18 ` shubhrajyoti.datta [this message]
2018-10-16 14:09 ` [LINUX PATCHv3 6/9] serial-uartlite: Change logic how console_port is setup kbuild test robot
2018-10-16 10:18 ` [LINUX PATCHv3 7/9] serial-uartlite: Use allocated structure instead of static ones shubhrajyoti.datta
2018-10-16 10:18 ` [LINUX PATCHv3 8/9] serial-uartlite: Remove ULITE_NR_PORTS macro shubhrajyoti.datta
2018-10-16 10:18 ` [LINUX PATCHv3 9/9] serial-uartlite: Remove SERIAL_UARTLITE_NR_UARTS shubhrajyoti.datta
2018-11-09 16:45 ` [LINUX PATCHv3 0/9] serial-uartlite: Add support for dynamic allocation Greg KH
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=1539685088-13465-7-git-send-email-shubhrajyoti.datta@gmail.com \
--to=shubhrajyoti.datta@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=jacmet@sunsite.dk \
--cc=jslaby@suse.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-serial@vger.kernel.org \
--cc=michal.simek@xilinx.com \
--cc=shubhrajyoti.datta@xilinx.com \
/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;
as well as URLs for NNTP newsgroup(s).