drivers/acpi/thermal.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-)
Fix the following formatting issues in thermal.c:
* braces following function declarations should be on a new line
* add single line between function declarations
Signed-off-by: Jonathan Bergh <bergh.jonathan@gmail.com>
---
drivers/acpi/thermal.c | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c
index 312730f8272e..dea5f8a51f87 100644
--- a/drivers/acpi/thermal.c
+++ b/drivers/acpi/thermal.c
@@ -1046,7 +1046,8 @@ static struct acpi_driver acpi_thermal_driver = {
.drv.pm = &acpi_thermal_pm,
};
-static int thermal_act(const struct dmi_system_id *d) {
+static int thermal_act(const struct dmi_system_id *d)
+{
if (act == 0) {
pr_notice("%s detected: disabling all active thermal trip points\n",
d->ident);
@@ -1054,13 +1055,17 @@ static int thermal_act(const struct dmi_system_id *d) {
}
return 0;
}
-static int thermal_nocrt(const struct dmi_system_id *d) {
+
+static int thermal_nocrt(const struct dmi_system_id *d)
+{
pr_notice("%s detected: disabling all critical thermal trip point actions.\n",
d->ident);
crt = -1;
return 0;
}
-static int thermal_tzp(const struct dmi_system_id *d) {
+
+static int thermal_tzp(const struct dmi_system_id *d)
+{
if (tzp == 0) {
pr_notice("%s detected: enabling thermal zone polling\n",
d->ident);
@@ -1068,7 +1073,9 @@ static int thermal_tzp(const struct dmi_system_id *d) {
}
return 0;
}
-static int thermal_psv(const struct dmi_system_id *d) {
+
+static int thermal_psv(const struct dmi_system_id *d)
+{
if (psv == 0) {
pr_notice("%s detected: disabling all passive thermal trip points\n",
d->ident);
--
2.34.1
On Fri, Sep 29, 2023 at 12:31 AM Jonathan Bergh
<bergh.jonathan@gmail.com> wrote:
>
> Fix the following formatting issues in thermal.c:
> * braces following function declarations should be on a new line
> * add single line between function declarations
>
> Signed-off-by: Jonathan Bergh <bergh.jonathan@gmail.com>
> ---
> drivers/acpi/thermal.c | 15 +++++++++++----
> 1 file changed, 11 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c
> index 312730f8272e..dea5f8a51f87 100644
> --- a/drivers/acpi/thermal.c
> +++ b/drivers/acpi/thermal.c
> @@ -1046,7 +1046,8 @@ static struct acpi_driver acpi_thermal_driver = {
> .drv.pm = &acpi_thermal_pm,
> };
>
> -static int thermal_act(const struct dmi_system_id *d) {
> +static int thermal_act(const struct dmi_system_id *d)
> +{
> if (act == 0) {
> pr_notice("%s detected: disabling all active thermal trip points\n",
> d->ident);
> @@ -1054,13 +1055,17 @@ static int thermal_act(const struct dmi_system_id *d) {
> }
> return 0;
> }
> -static int thermal_nocrt(const struct dmi_system_id *d) {
> +
> +static int thermal_nocrt(const struct dmi_system_id *d)
> +{
> pr_notice("%s detected: disabling all critical thermal trip point actions.\n",
> d->ident);
> crt = -1;
> return 0;
> }
> -static int thermal_tzp(const struct dmi_system_id *d) {
> +
> +static int thermal_tzp(const struct dmi_system_id *d)
> +{
> if (tzp == 0) {
> pr_notice("%s detected: enabling thermal zone polling\n",
> d->ident);
> @@ -1068,7 +1073,9 @@ static int thermal_tzp(const struct dmi_system_id *d) {
> }
> return 0;
> }
> -static int thermal_psv(const struct dmi_system_id *d) {
> +
> +static int thermal_psv(const struct dmi_system_id *d)
> +{
> if (psv == 0) {
> pr_notice("%s detected: disabling all passive thermal trip points\n",
> d->ident);
> --
Applied as 6.7 material (with edited subject and changelog), thanks!
© 2016 - 2025 Red Hat, Inc.