Re: [patch 18/19] ACPI: make code static

[Len Brown <lenb@kernel.org>]

On Wednesday 20 December 2006 17:02, Len Brown wrote:
> Applied.

Wups, had to NAK the acpi_pci_bind part...

drivers/acpi/pci_root.c: In function ‘acpi_pci_root_add’:
drivers/acpi/pci_root.c:181: error: ‘acpi_pci_bind’ undeclared (first use in this function)
drivers/acpi/pci_root.c:181: error: (Each undeclared identifier is reported only once
drivers/acpi/pci_root.c:181: error: for each function it appears in.)
make[2]: *** [drivers/acpi/pci_root.o] Error 1
make[2]: *** Waiting for unfinished jobs....
  LD      drivers/pnp/pnpacpi/built-in.o
  LD      drivers/pnp/built-in.o
drivers/acpi/pci_bind.c: In function ‘acpi_pci_bind’:
drivers/acpi/pci_bind.c:225: error: ‘acpi_pci_unbind’ undeclared (first use in this function)
drivers/acpi/pci_bind.c:225: error: (Each undeclared identifier is reported only once
drivers/acpi/pci_bind.c:225: error: for each function it appears in.)
make[2]: *** [drivers/acpi/pci_bind.o] Error 1

Leaving that below.

thanks,
-Len

commit 9e0ed41e9aff61648e2261ab334fb5eea3d5aeb3
Author: Adrian Bunk <bunk@stusta.de>
Date:   Tue Dec 19 12:56:24 2006 -0800

    ACPI: make code static
    
    Signed-off-by: Adrian Bunk <bunk@stusta.de>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Len Brown <len.brown@intel.com>

diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index 279c4ba..555bf00 100644
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -728,7 +728,7 @@ static int __init acpi_bus_init(void)
 	return -ENODEV;
 }
 
-decl_subsys(acpi, NULL, NULL);
+static decl_subsys(acpi, NULL, NULL);
 
 static int __init acpi_init(void)
 {
diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c
index 90990a4..a66b4c7 100644
--- a/drivers/acpi/dock.c
+++ b/drivers/acpi/dock.c
@@ -641,7 +641,7 @@ static ssize_t show_docked(struct device *dev,
 	return snprintf(buf, PAGE_SIZE, "%d\n", dock_present(dock_station));
 
 }
-DEVICE_ATTR(docked, S_IRUGO, show_docked, NULL);
+static DEVICE_ATTR(docked, S_IRUGO, show_docked, NULL);
 
 /*
  * write_undock - write method for "undock" file in sysfs
@@ -657,7 +657,7 @@ static ssize_t write_undock(struct device *dev, struct device_attribute *attr,
 	ret = handle_eject_request(dock_station, ACPI_NOTIFY_EJECT_REQUEST);
 	return ret ? ret: count;
 }
-DEVICE_ATTR(undock, S_IWUSR, NULL, write_undock);
+static DEVICE_ATTR(undock, S_IWUSR, NULL, write_undock);
 
 /**
  * dock_add - add a new dock station
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
index fdd1095..cefe952 100644
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
@@ -315,8 +315,6 @@ struct acpi_bus_event {
 	u32 data;
 };
 
-extern struct subsystem acpi_subsys;
-
 /*
  * External Functions
  */
-
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html