From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Mon, 23 Aug 2021 11:47:29 +0000 (+0200)
Subject: Merge branches 'acpi-numa', 'acpi-glue', 'acpi-config' and 'acpi-pmic' into linux... 
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=e182963dfd01108f9b261d7c9d8d7e57d57758e3;p=users%2Fjedix%2Flinux-maple.git

Merge branches 'acpi-numa', 'acpi-glue', 'acpi-config' and 'acpi-pmic' into linux-next

* acpi-numa:
  ACPI: Add LoongArch support for ACPI_PROCESSOR/ACPI_NUMA

* acpi-glue:
  driver core: Split device_platform_notify()
  software nodes: Split software_node_notify()
  ACPI: glue: Eliminate acpi_platform_notify()
  ACPI: bus: Rename functions to avoid name collision
  ACPI: glue: Change return type of two functions to void
  ACPI: glue: Rearrange acpi_device_notify()

* acpi-config:
  ACPI: configfs: Make get_header() to return error pointer
  ACPI: configfs: Use sysfs_emit() in "show" functions

* acpi-pmic:
  ACPI / PMIC: XPower: optimize MIPI PMIQ sequence I2C-bus accesses
  ACPI / PMIC: XPower: optimize I2C-bus accesses
---

e182963dfd01108f9b261d7c9d8d7e57d57758e3
diff --cc drivers/base/core.c
index 6c0ef9d55a34,cadcade65825,70ef0ed710b8,cadcade65825,cadcade65825..3a72241b87c6
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@@@@@ -2002,24 -2000,24 -2000,24 -2000,24 -2000,24 +2002,24 @@@@@@ static inline int device_is_not_partiti
     }
     #endif
     
-- --static int
-- --device_platform_notify(struct device *dev, enum kobject_action action)
++ ++static void device_platform_notify(struct device *dev)
     {
-- --	int ret;
 - --
 - --	ret = acpi_platform_notify(dev, action);
 - --	if (ret)
 - --		return ret;
++ ++	acpi_device_notify(dev);
     
-    	ret = acpi_platform_notify(dev, action);
 - --	ret = software_node_notify(dev, action);
-- --	if (ret)
-- --		return ret;
++ ++	software_node_notify(dev);
     
-    	ret = software_node_notify(dev, action);
-    	if (ret)
-    		return ret;
-    
-- --	if (platform_notify && action == KOBJ_ADD)
++ ++	if (platform_notify)
     		platform_notify(dev);
-- --	else if (platform_notify_remove && action == KOBJ_REMOVE)
++ ++}
++ ++
++ ++static void device_platform_notify_remove(struct device *dev)
++ ++{
++ ++	acpi_device_notify_remove(dev);
++ ++
++ ++	software_node_notify_remove(dev);
++ ++
++ ++	if (platform_notify_remove)
     		platform_notify_remove(dev);
-- --	return 0;
     }
     
     /**