From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Tue, 29 Jun 2021 13:50:37 +0000 (+0200)
Subject: Merge branches 'acpi-dptf' and 'acpi-messages'
X-Git-Tag: v5.15~867^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8b457d60608aa76d7ce9c04a312669761025ba42;p=platform%2Fkernel%2Flinux-starfive.git

Merge branches 'acpi-dptf' and 'acpi-messages'

* acpi-dptf:
  ACPI: DPTF: Add battery participant for Intel SoCs

* acpi-messages:
  ACPI: Remove the macro PREFIX "ACPI: "
  ACPI: sleep: Unify the message printing
  ACPI: sbs: Unify the message printing
  ACPI: scan: Unify the log message printing
  ACPI: sbshc: Unify the message printing
  ACPI: sysfs: Cleanup message printing
  ACPI: reboot: Unify the message printing
  ACPI: processor_throttling: Cleanup the printing messages
  ACPI: processor_perflib: Cleanup print messages
  ACPI: processor_thermal: Remove unused PREFIX for printing
  ACPI: pci_root: Unify the message printing
  ACPI: osl: Remove the duplicated PREFIX for message printing
  ACPI: nvs: Unify the message printing
  ACPI: glue: Clean up the printing messages
  ACPI: event: Use pr_*() macros to replace printk()
  ACPI: bus: Use pr_*() macros to replace printk()
  ACPI: blacklist: Unify the message printing
  ACPI: cmos_rtc: Using pr_fmt() and remove PREFIX
---

8b457d60608aa76d7ce9c04a312669761025ba42
diff --cc drivers/acpi/internal.h
index 00f4e28c,b852cff,bbe1064..b1d2cc3
--- a/drivers/acpi/internal.h
+++ b/drivers/acpi/internal.h
@@@@ -142,7 -142,6 -140,7 +140,7 @@@@ int acpi_device_sleep_wake(struct acpi_
   int acpi_power_get_inferred_state(struct acpi_device *device, int *state);
   int acpi_power_on_resources(struct acpi_device *device, int state);
   int acpi_power_transition(struct acpi_device *device, int state);
  -void acpi_turn_off_unused_power_resources(bool init);
 ++void acpi_turn_off_unused_power_resources(void);
   
   /* --------------------------------------------------------------------------
                                 Device Power Management
diff --cc drivers/acpi/processor_throttling.c
index dbccc92e,e61b8f0,0086afe..a822fe4
--- a/drivers/acpi/processor_throttling.c
+++ b/drivers/acpi/processor_throttling.c
@@@@ -6,9 -6,9 -6,11 +6,11 @@@@
    *  Copyright (C) 2001, 2002 Paul Diefenbaugh <paul.s.diefenbaugh@intel.com>
    *  Copyright (C) 2004       Dominik Brodowski <linux@brodo.de>
    *  Copyright (C) 2004  Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com>
 -- *  			- Added processor hotplug support
 ++ *                      - Added processor hotplug support
    */
   
++ #define pr_fmt(fmt) "ACPI: " fmt
++ 
   #include <linux/kernel.h>
   #include <linux/module.h>
   #include <linux/slab.h>
diff --cc drivers/acpi/scan.c
index f8eaddb,a22778e,0c916c1..57507b6
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@@@ -2485,8 -2359,6 -2361,8 +2486,8 @@@@ int __init acpi_scan_init(void
   		}
   	}
   
  -	acpi_turn_off_unused_power_resources(true);
 ++	acpi_turn_off_unused_power_resources();
 + 
   	acpi_scan_initialized = true;
   
    out: