[PATCH 0/2] PCI/ACPI: Unexport pci_root.c functions

[PATCH 0/2] PCI/ACPI: Unexport pci_root.c functions

[Bjorn Helgaas]

From: Bjorn Helgaas <bhelgaas@google.com>

Unexport a couple functions that are no longer needed by modules.

Bjorn Helgaas (2):
  PCI/ACPI: Unexport acpi_pci_osc_control_set()
  PCI/ACPI: Unexport acpi_pci_find_root()

 drivers/acpi/pci_root.c | 5 ++---
 include/linux/acpi.h    | 3 ---
 2 files changed, 2 insertions(+), 6 deletions(-)


base-commit: b3a9e3b9622ae10064826dccb4f7a52bd88c7407
-- 
2.25.1

[PATCH 1/2] PCI/ACPI: Unexport acpi_pci_osc_control_set()

[Bjorn Helgaas]

From: Bjorn Helgaas <bhelgaas@google.com>

acpi_pci_osc_control_set() is called only inside pci_root.c and there's no
need for it to be called by modules.  Make it static and unexport it.

Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
---
 drivers/acpi/pci_root.c | 4 ++--
 include/linux/acpi.h    | 3 ---
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c
index f90e841c59f5..b6da9745efcd 100644
--- a/drivers/acpi/pci_root.c
+++ b/drivers/acpi/pci_root.c
@@ -355,7 +355,8 @@ EXPORT_SYMBOL_GPL(acpi_get_pci_dev);
  * _OSC bits the BIOS has granted control of, but its contents are meaningless
  * on failure.
  **/
-acpi_status acpi_pci_osc_control_set(acpi_handle handle, u32 *mask, u32 req)
+static acpi_status acpi_pci_osc_control_set(acpi_handle handle, u32 *mask,
+					    u32 req)
 {
 	struct acpi_pci_root *root;
 	acpi_status status = AE_OK;
@@ -408,7 +409,6 @@ acpi_status acpi_pci_osc_control_set(acpi_handle handle, u32 *mask, u32 req)
 	mutex_unlock(&osc_lock);
 	return status;
 }
-EXPORT_SYMBOL(acpi_pci_osc_control_set);
 
 static void negotiate_os_control(struct acpi_pci_root *root, int *no_aspm,
 				 bool is_pcie)
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index d661cd0ee64d..bb20a872729e 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -581,9 +581,6 @@ extern bool osc_pc_lpi_support_confirmed;
 #define ACPI_GSB_ACCESS_ATTRIB_RAW_BYTES	0x0000000E
 #define ACPI_GSB_ACCESS_ATTRIB_RAW_PROCESS	0x0000000F
 
-extern acpi_status acpi_pci_osc_control_set(acpi_handle handle,
-					     u32 *mask, u32 req);
-
 /* Enable _OST when all relevant hotplug operations are enabled */
 #if defined(CONFIG_ACPI_HOTPLUG_CPU) &&			\
 	defined(CONFIG_ACPI_HOTPLUG_MEMORY) &&		\
-- 
2.25.1

[PATCH 2/2] PCI/ACPI: Unexport acpi_pci_find_root()

[Bjorn Helgaas]

From: Bjorn Helgaas <bhelgaas@google.com>

acpi_pci_find_root() is called only from pci_root.c and
drivers/pci/hotplug/acpi_pcihp.c, neither of which can be modules.
Unexport it.

Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
---
 drivers/acpi/pci_root.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c
index b6da9745efcd..933890f97720 100644
--- a/drivers/acpi/pci_root.c
+++ b/drivers/acpi/pci_root.c
@@ -246,7 +246,6 @@ struct acpi_pci_root *acpi_pci_find_root(acpi_handle handle)
 
 	return root;
 }
-EXPORT_SYMBOL_GPL(acpi_pci_find_root);
 
 struct acpi_handle_node {
 	struct list_head node;
-- 
2.25.1

Re: [PATCH 0/2] PCI/ACPI: Unexport pci_root.c functions

[Rafael J. Wysocki]

On Fri, Jul 10, 2020 at 11:38 PM Bjorn Helgaas <helgaas@kernel.org> wrote:
>
> From: Bjorn Helgaas <bhelgaas@google.com>
>
> Unexport a couple functions that are no longer needed by modules.
>
> Bjorn Helgaas (2):
>   PCI/ACPI: Unexport acpi_pci_osc_control_set()
>   PCI/ACPI: Unexport acpi_pci_find_root()

For both:

Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

>  drivers/acpi/pci_root.c | 5 ++---
>  include/linux/acpi.h    | 3 ---
>  2 files changed, 2 insertions(+), 6 deletions(-)
>
>
> base-commit: b3a9e3b9622ae10064826dccb4f7a52bd88c7407