Browse Source

ACPI dock: move some functions to .init.text

find_dock and find_bay are only called by dock_init which lives in
.init.text dock_add is only called by find_dock and find_bay.  So all
three functions can be moved to .init.text, too.

This fixes:

        WARNING: vmlinux.o(.text+0x2134b7): Section mismatch in reference from the function dock_add() to the function .init.text:platform_device_register_resndata()
        The function dock_add() references
        the function __init platform_device_register_resndata().
        This is often because dock_add lacks a __init
        annotation or the annotation of platform_device_register_resndata is wrong.

for a build with unset CONFIG_MODULES.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Len Brown <len.brown@intel.com>
Uwe Kleine-König 14 years ago
parent
commit
d38a5edf81
1 changed files with 3 additions and 3 deletions
  1. 3 3
      drivers/acpi/dock.c

+ 3 - 3
drivers/acpi/dock.c

@@ -929,7 +929,7 @@ static struct attribute_group dock_attribute_group = {
  * allocated and initialize a new dock station device.  Find all devices
  * allocated and initialize a new dock station device.  Find all devices
  * that are on the dock station, and register for dock event notifications.
  * that are on the dock station, and register for dock event notifications.
  */
  */
-static int dock_add(acpi_handle handle)
+static int __init dock_add(acpi_handle handle)
 {
 {
 	int ret, id;
 	int ret, id;
 	struct dock_station ds, *dock_station;
 	struct dock_station ds, *dock_station;
@@ -1023,7 +1023,7 @@ static int dock_remove(struct dock_station *ds)
  *
  *
  * This is called by acpi_walk_namespace to look for dock stations.
  * This is called by acpi_walk_namespace to look for dock stations.
  */
  */
-static acpi_status
+static __init acpi_status
 find_dock(acpi_handle handle, u32 lvl, void *context, void **rv)
 find_dock(acpi_handle handle, u32 lvl, void *context, void **rv)
 {
 {
 	if (is_dock(handle))
 	if (is_dock(handle))
@@ -1032,7 +1032,7 @@ find_dock(acpi_handle handle, u32 lvl, void *context, void **rv)
 	return AE_OK;
 	return AE_OK;
 }
 }
 
 
-static acpi_status
+static __init acpi_status
 find_bay(acpi_handle handle, u32 lvl, void *context, void **rv)
 find_bay(acpi_handle handle, u32 lvl, void *context, void **rv)
 {
 {
 	/* If bay is a dock, it's already handled */
 	/* If bay is a dock, it's already handled */