From: Erwan Le Ray <erwan.leray@foss.st.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Jiri Slaby <jslaby@suse.com>, Rob Herring <robh+dt@kernel.org>,
Maxime Coquelin <mcoquelin.stm32@gmail.com>,
Alexandre Torgue <alexandre.torgue@foss.st.com>
Cc: <linux-serial@vger.kernel.org>, <devicetree@vger.kernel.org>,
<linux-stm32@st-md-mailman.stormreply.com>,
<linux-arm-kernel@lists.infradead.org>,
<linux-kernel@vger.kernel.org>,
Erwan Le Ray <erwan.leray@foss.st.com>,
Fabrice Gasnier <fabrice.gasnier@foss.st.com>,
Valentin Caron <valentin.caron@foss.st.com>,
Etienne Carriere <etienne.carriere@foss.st.com>
Subject: [PATCH v2 7/8] serial: stm32: clean probe and remove port deinit
Date: Wed, 6 Jan 2021 17:22:02 +0100 [thread overview]
Message-ID: <20210106162203.28854-8-erwan.leray@foss.st.com> (raw)
In-Reply-To: <20210106162203.28854-1-erwan.leray@foss.st.com>
Clean probe and remove port deinit by moving clk_disable_unprepare in a
new dedicated deinit_port function.
Signed-off-by: Erwan Le Ray <erwan.leray@foss.st.com>
Signed-off-by: Etienne Carriere <etienne.carriere@foss.st.com>
diff --git a/drivers/tty/serial/stm32-usart.c b/drivers/tty/serial/stm32-usart.c
index 0d6c7f3375f0..9d73f6976586 100644
--- a/drivers/tty/serial/stm32-usart.c
+++ b/drivers/tty/serial/stm32-usart.c
@@ -970,6 +970,11 @@ static const struct uart_ops stm32_uart_ops = {
.verify_port = stm32_usart_verify_port,
};
+static void stm32_usart_deinit_port(struct stm32_port *stm32port)
+{
+ clk_disable_unprepare(stm32port->clk);
+}
+
static int stm32_usart_init_port(struct stm32_port *stm32port,
struct platform_device *pdev)
{
@@ -1279,7 +1284,7 @@ static int stm32_usart_serial_probe(struct platform_device *pdev)
device_init_wakeup(&pdev->dev, false);
err_uninit:
- clk_disable_unprepare(stm32port->clk);
+ stm32_usart_deinit_port(stm32port);
return ret;
}
@@ -1318,7 +1323,7 @@ static int stm32_usart_serial_remove(struct platform_device *pdev)
device_init_wakeup(&pdev->dev, false);
}
- clk_disable_unprepare(stm32_port->clk);
+ stm32_usart_deinit_port(stm32_port);
err = uart_remove_one_port(&stm32_usart_driver, port);
--
2.17.1
WARNING: multiple messages have this Message-ID (diff)
From: Erwan Le Ray <erwan.leray@foss.st.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Jiri Slaby <jslaby@suse.com>, Rob Herring <robh+dt@kernel.org>,
Maxime Coquelin <mcoquelin.stm32@gmail.com>,
Alexandre Torgue <alexandre.torgue@foss.st.com>
Cc: devicetree@vger.kernel.org,
Valentin Caron <valentin.caron@foss.st.com>,
Erwan Le Ray <erwan.leray@foss.st.com>,
linux-kernel@vger.kernel.org,
Fabrice Gasnier <fabrice.gasnier@foss.st.com>,
Etienne Carriere <etienne.carriere@foss.st.com>,
linux-serial@vger.kernel.org,
linux-stm32@st-md-mailman.stormreply.com,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 7/8] serial: stm32: clean probe and remove port deinit
Date: Wed, 6 Jan 2021 17:22:02 +0100 [thread overview]
Message-ID: <20210106162203.28854-8-erwan.leray@foss.st.com> (raw)
In-Reply-To: <20210106162203.28854-1-erwan.leray@foss.st.com>
Clean probe and remove port deinit by moving clk_disable_unprepare in a
new dedicated deinit_port function.
Signed-off-by: Erwan Le Ray <erwan.leray@foss.st.com>
Signed-off-by: Etienne Carriere <etienne.carriere@foss.st.com>
diff --git a/drivers/tty/serial/stm32-usart.c b/drivers/tty/serial/stm32-usart.c
index 0d6c7f3375f0..9d73f6976586 100644
--- a/drivers/tty/serial/stm32-usart.c
+++ b/drivers/tty/serial/stm32-usart.c
@@ -970,6 +970,11 @@ static const struct uart_ops stm32_uart_ops = {
.verify_port = stm32_usart_verify_port,
};
+static void stm32_usart_deinit_port(struct stm32_port *stm32port)
+{
+ clk_disable_unprepare(stm32port->clk);
+}
+
static int stm32_usart_init_port(struct stm32_port *stm32port,
struct platform_device *pdev)
{
@@ -1279,7 +1284,7 @@ static int stm32_usart_serial_probe(struct platform_device *pdev)
device_init_wakeup(&pdev->dev, false);
err_uninit:
- clk_disable_unprepare(stm32port->clk);
+ stm32_usart_deinit_port(stm32port);
return ret;
}
@@ -1318,7 +1323,7 @@ static int stm32_usart_serial_remove(struct platform_device *pdev)
device_init_wakeup(&pdev->dev, false);
}
- clk_disable_unprepare(stm32_port->clk);
+ stm32_usart_deinit_port(stm32_port);
err = uart_remove_one_port(&stm32_usart_driver, port);
--
2.17.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2021-01-06 16:24 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-06 16:21 [PATCH 0/7] STM32 uart cleanup and improvements Erwan Le Ray
2021-01-06 16:21 ` Erwan Le Ray
2021-01-06 16:21 ` [PATCH v2 1/8] serial: stm32: fix DMA initialization error handling Erwan Le Ray
2021-01-06 16:21 ` Erwan Le Ray
2021-01-06 16:21 ` [PATCH v2 2/8] serial: stm32: fix code cleaning warnings and checks Erwan Le Ray
2021-01-06 16:21 ` Erwan Le Ray
2021-01-11 9:58 ` Jiri Slaby
2021-01-11 9:58 ` Jiri Slaby
2021-01-12 10:02 ` Erwan LE RAY
2021-01-12 10:02 ` Erwan LE RAY
2021-01-12 10:24 ` Greg Kroah-Hartman
2021-01-12 10:24 ` Greg Kroah-Hartman
2021-01-06 16:21 ` [PATCH v2 3/8] serial: stm32: add "_usart" prefix in functions name Erwan Le Ray
2021-01-06 16:21 ` Erwan Le Ray
2021-01-06 16:21 ` [PATCH v2 4/8] serial: stm32: add author Erwan Le Ray
2021-01-06 16:21 ` Erwan Le Ray
2021-01-11 9:59 ` Jiri Slaby
2021-01-11 9:59 ` Jiri Slaby
2021-01-06 16:22 ` [PATCH v2 5/8] dt-bindings: serial: stm32: update rts-gpios and cts-gpios Erwan Le Ray
2021-01-06 16:22 ` Erwan Le Ray
2021-01-06 16:22 ` [PATCH v2 6/8] serial: stm32: update conflicting RTS/CTS config comment Erwan Le Ray
2021-01-06 16:22 ` Erwan Le Ray
2021-01-06 16:22 ` Erwan Le Ray [this message]
2021-01-06 16:22 ` [PATCH v2 7/8] serial: stm32: clean probe and remove port deinit Erwan Le Ray
2021-01-06 16:22 ` [PATCH v2 8/8] serial: stm32: update transmission complete error message in shutdown Erwan Le Ray
2021-01-06 16:22 ` Erwan Le Ray
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=20210106162203.28854-8-erwan.leray@foss.st.com \
--to=erwan.leray@foss.st.com \
--cc=alexandre.torgue@foss.st.com \
--cc=devicetree@vger.kernel.org \
--cc=etienne.carriere@foss.st.com \
--cc=fabrice.gasnier@foss.st.com \
--cc=gregkh@linuxfoundation.org \
--cc=jslaby@suse.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-serial@vger.kernel.org \
--cc=linux-stm32@st-md-mailman.stormreply.com \
--cc=mcoquelin.stm32@gmail.com \
--cc=robh+dt@kernel.org \
--cc=valentin.caron@foss.st.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.