aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@kernel.org>2007-10-24 12:24:42 -0400
committerLen Brown <len.brown@intel.com>2008-02-07 03:33:23 -0500
commite5685b9d35c2cc0a98425b05df30cb837dd1e632 (patch)
tree7f10940d8bdaa18cd806d42a3fdb63cfefc47f37
parent87ecd5cddaa37f057d8d8c2813e1b748b1804423 (diff)
ACPI: misc cleanups
This patch contains the following possible cleanups: - make the following needlessly global code static: - drivers/acpi/bay.c:dev_attr_eject - drivers/acpi/bay.c:dev_attr_present - drivers/acpi/dock.c:dev_attr_docked - drivers/acpi/dock.c:dev_attr_flags - drivers/acpi/dock.c:dev_attr_uid - drivers/acpi/dock.c:dev_attr_undock - drivers/acpi/pci_bind.c:acpi_pci_unbind() - drivers/acpi/pci_link.c:acpi_link_lock - drivers/acpi/sbs.c:acpi_sbs_callback() - drivers/acpi/sbshc.c:acpi_smbus_transaction() - drivers/acpi/sleep/main.c:acpi_sleep_prepare() - #if 0 the following unused global functions: - drivers/acpi/numa.c:acpi_unmap_pxm_to_node() - remove the following unused EXPORT_SYMBOL's: - acpi_register_gsi - acpi_unregister_gsi - acpi_strict - acpi_bus_receive_event - register_acpi_bus_type - unregister_acpi_bus_type - acpi_os_printf - acpi_os_sleep - acpi_os_stall - acpi_os_read_pci_configuration - acpi_os_create_semaphore - acpi_os_delete_semaphore - acpi_os_wait_semaphore - acpi_os_signal_semaphore - acpi_os_signal - acpi_pci_irq_enable - acpi_get_pxm Signed-off-by: Adrian Bunk <bunk@kernel.org> Acked-by: Alexey Starikovskiy <astarikovskiy@suse.de> Signed-off-by: Len Brown <len.brown@intel.com>
-rw-r--r--arch/ia64/kernel/acpi.c4
-rw-r--r--arch/x86/kernel/acpi/boot.c3
-rw-r--r--drivers/acpi/bay.c4
-rw-r--r--drivers/acpi/bus.c1
-rw-r--r--drivers/acpi/dock.c8
-rw-r--r--drivers/acpi/glue.c4
-rw-r--r--drivers/acpi/numa.c3
-rw-r--r--drivers/acpi/osl.c18
-rw-r--r--drivers/acpi/pci_bind.c4
-rw-r--r--drivers/acpi/pci_irq.c2
-rw-r--r--drivers/acpi/pci_link.c2
-rw-r--r--drivers/acpi/sbs.c2
-rw-r--r--drivers/acpi/sbshc.c4
-rw-r--r--include/acpi/acpi_drivers.h1
-rw-r--r--include/acpi/acpi_numa.h1
15 files changed, 15 insertions, 46 deletions
diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c
index 00b5d08f6da8..78206f1b71d2 100644
--- a/arch/ia64/kernel/acpi.c
+++ b/arch/ia64/kernel/acpi.c
@@ -601,8 +601,6 @@ int acpi_register_gsi(u32 gsi, int triggering, int polarity)
601 IOSAPIC_LEVEL); 601 IOSAPIC_LEVEL);
602} 602}
603 603
604EXPORT_SYMBOL(acpi_register_gsi);
605
606void acpi_unregister_gsi(u32 gsi) 604void acpi_unregister_gsi(u32 gsi)
607{ 605{
608 if (acpi_irq_model == ACPI_IRQ_MODEL_PLATFORM) 606 if (acpi_irq_model == ACPI_IRQ_MODEL_PLATFORM)
@@ -611,8 +609,6 @@ void acpi_unregister_gsi(u32 gsi)
611 iosapic_unregister_intr(gsi); 609 iosapic_unregister_intr(gsi);
612} 610}
613 611
614EXPORT_SYMBOL(acpi_unregister_gsi);
615
616static int __init acpi_parse_fadt(struct acpi_table_header *table) 612static int __init acpi_parse_fadt(struct acpi_table_header *table)
617{ 613{
618 struct acpi_table_header *fadt_header; 614 struct acpi_table_header *fadt_header;
diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
index d2a58431a074..529e52df4e1d 100644
--- a/arch/x86/kernel/acpi/boot.c
+++ b/arch/x86/kernel/acpi/boot.c
@@ -78,7 +78,6 @@ int acpi_ht __initdata = 1; /* enable HT */
78int acpi_lapic; 78int acpi_lapic;
79int acpi_ioapic; 79int acpi_ioapic;
80int acpi_strict; 80int acpi_strict;
81EXPORT_SYMBOL(acpi_strict);
82 81
83u8 acpi_sci_flags __initdata; 82u8 acpi_sci_flags __initdata;
84int acpi_sci_override_gsi __initdata; 83int acpi_sci_override_gsi __initdata;
@@ -490,8 +489,6 @@ int acpi_register_gsi(u32 gsi, int triggering, int polarity)
490 return irq; 489 return irq;
491} 490}
492 491
493EXPORT_SYMBOL(acpi_register_gsi);
494
495/* 492/*
496 * ACPI based hotplug support for CPU 493 * ACPI based hotplug support for CPU
497 */ 494 */
diff --git a/drivers/acpi/bay.c b/drivers/acpi/bay.c
index 6daf6088ac88..0c81294ac489 100644
--- a/drivers/acpi/bay.c
+++ b/drivers/acpi/bay.c
@@ -128,7 +128,7 @@ static ssize_t show_present(struct device *dev,
128 return snprintf(buf, PAGE_SIZE, "%d\n", bay_present(bay)); 128 return snprintf(buf, PAGE_SIZE, "%d\n", bay_present(bay));
129 129
130} 130}
131DEVICE_ATTR(present, S_IRUGO, show_present, NULL); 131static DEVICE_ATTR(present, S_IRUGO, show_present, NULL);
132 132
133/* 133/*
134 * write_eject - write method for "eject" file in sysfs 134 * write_eject - write method for "eject" file in sysfs
@@ -144,7 +144,7 @@ static ssize_t write_eject(struct device *dev, struct device_attribute *attr,
144 eject_device(bay->handle); 144 eject_device(bay->handle);
145 return count; 145 return count;
146} 146}
147DEVICE_ATTR(eject, S_IWUSR, NULL, write_eject); 147static DEVICE_ATTR(eject, S_IWUSR, NULL, write_eject);
148 148
149/** 149/**
150 * is_ata - see if a device is an ata device 150 * is_ata - see if a device is an ata device
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index 1b4cf984b081..2994bb2b22e9 100644
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -366,7 +366,6 @@ int acpi_bus_receive_event(struct acpi_bus_event *event)
366 return 0; 366 return 0;
367} 367}
368 368
369EXPORT_SYMBOL(acpi_bus_receive_event);
370#endif /* CONFIG_ACPI_PROC_EVENT */ 369#endif /* CONFIG_ACPI_PROC_EVENT */
371 370
372/* -------------------------------------------------------------------------- 371/* --------------------------------------------------------------------------
diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c
index 1dabdf4c07b3..7e47a981cc27 100644
--- a/drivers/acpi/dock.c
+++ b/drivers/acpi/dock.c
@@ -680,7 +680,7 @@ static ssize_t show_docked(struct device *dev,
680 return snprintf(buf, PAGE_SIZE, "%d\n", dock_present(dock_station)); 680 return snprintf(buf, PAGE_SIZE, "%d\n", dock_present(dock_station));
681 681
682} 682}
683DEVICE_ATTR(docked, S_IRUGO, show_docked, NULL); 683static DEVICE_ATTR(docked, S_IRUGO, show_docked, NULL);
684 684
685/* 685/*
686 * show_flags - read method for flags file in sysfs 686 * show_flags - read method for flags file in sysfs
@@ -691,7 +691,7 @@ static ssize_t show_flags(struct device *dev,
691 return snprintf(buf, PAGE_SIZE, "%d\n", dock_station->flags); 691 return snprintf(buf, PAGE_SIZE, "%d\n", dock_station->flags);
692 692
693} 693}
694DEVICE_ATTR(flags, S_IRUGO, show_flags, NULL); 694static DEVICE_ATTR(flags, S_IRUGO, show_flags, NULL);
695 695
696/* 696/*
697 * write_undock - write method for "undock" file in sysfs 697 * write_undock - write method for "undock" file in sysfs
@@ -707,7 +707,7 @@ static ssize_t write_undock(struct device *dev, struct device_attribute *attr,
707 ret = handle_eject_request(dock_station, ACPI_NOTIFY_EJECT_REQUEST); 707 ret = handle_eject_request(dock_station, ACPI_NOTIFY_EJECT_REQUEST);
708 return ret ? ret: count; 708 return ret ? ret: count;
709} 709}
710DEVICE_ATTR(undock, S_IWUSR, NULL, write_undock); 710static DEVICE_ATTR(undock, S_IWUSR, NULL, write_undock);
711 711
712/* 712/*
713 * show_dock_uid - read method for "uid" file in sysfs 713 * show_dock_uid - read method for "uid" file in sysfs
@@ -723,7 +723,7 @@ static ssize_t show_dock_uid(struct device *dev,
723 723
724 return snprintf(buf, PAGE_SIZE, "%lx\n", lbuf); 724 return snprintf(buf, PAGE_SIZE, "%lx\n", lbuf);
725} 725}
726DEVICE_ATTR(uid, S_IRUGO, show_dock_uid, NULL); 726static DEVICE_ATTR(uid, S_IRUGO, show_dock_uid, NULL);
727 727
728/** 728/**
729 * dock_add - add a new dock station 729 * dock_add - add a new dock station
diff --git a/drivers/acpi/glue.c b/drivers/acpi/glue.c
index 4893e256e399..eda0978b57c6 100644
--- a/drivers/acpi/glue.c
+++ b/drivers/acpi/glue.c
@@ -36,8 +36,6 @@ int register_acpi_bus_type(struct acpi_bus_type *type)
36 return -ENODEV; 36 return -ENODEV;
37} 37}
38 38
39EXPORT_SYMBOL(register_acpi_bus_type);
40
41int unregister_acpi_bus_type(struct acpi_bus_type *type) 39int unregister_acpi_bus_type(struct acpi_bus_type *type)
42{ 40{
43 if (acpi_disabled) 41 if (acpi_disabled)
@@ -53,8 +51,6 @@ int unregister_acpi_bus_type(struct acpi_bus_type *type)
53 return -ENODEV; 51 return -ENODEV;
54} 52}
55 53
56EXPORT_SYMBOL(unregister_acpi_bus_type);
57
58static struct acpi_bus_type *acpi_get_bus_type(struct bus_type *type) 54static struct acpi_bus_type *acpi_get_bus_type(struct bus_type *type)
59{ 55{
60 struct acpi_bus_type *tmp, *ret = NULL; 56 struct acpi_bus_type *tmp, *ret = NULL;
diff --git a/drivers/acpi/numa.c b/drivers/acpi/numa.c
index 0822d9fc1cb4..5d59cb33b1a5 100644
--- a/drivers/acpi/numa.c
+++ b/drivers/acpi/numa.c
@@ -78,6 +78,7 @@ int acpi_map_pxm_to_node(int pxm)
78 return node; 78 return node;
79} 79}
80 80
81#if 0
81void __cpuinit acpi_unmap_pxm_to_node(int node) 82void __cpuinit acpi_unmap_pxm_to_node(int node)
82{ 83{
83 int pxm = node_to_pxm_map[node]; 84 int pxm = node_to_pxm_map[node];
@@ -85,6 +86,7 @@ void __cpuinit acpi_unmap_pxm_to_node(int node)
85 node_to_pxm_map[node] = PXM_INVAL; 86 node_to_pxm_map[node] = PXM_INVAL;
86 node_clear(node, nodes_found_map); 87 node_clear(node, nodes_found_map);
87} 88}
89#endif /* 0 */
88 90
89static void __init 91static void __init
90acpi_table_print_srat_entry(struct acpi_subtable_header *header) 92acpi_table_print_srat_entry(struct acpi_subtable_header *header)
@@ -247,7 +249,6 @@ int acpi_get_pxm(acpi_handle h)
247 } while (ACPI_SUCCESS(status)); 249 } while (ACPI_SUCCESS(status));
248 return -1; 250 return -1;
249} 251}
250EXPORT_SYMBOL(acpi_get_pxm);
251 252
252int acpi_get_node(acpi_handle *handle) 253int acpi_get_node(acpi_handle *handle)
253{ 254{
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index e53fb516f9d4..7fcacc5ed821 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -219,8 +219,6 @@ void acpi_os_printf(const char *fmt, ...)
219 va_end(args); 219 va_end(args);
220} 220}
221 221
222EXPORT_SYMBOL(acpi_os_printf);
223
224void acpi_os_vprintf(const char *fmt, va_list args) 222void acpi_os_vprintf(const char *fmt, va_list args)
225{ 223{
226 static char buffer[512]; 224 static char buffer[512];
@@ -384,8 +382,6 @@ void acpi_os_sleep(acpi_integer ms)
384 schedule_timeout_interruptible(msecs_to_jiffies(ms)); 382 schedule_timeout_interruptible(msecs_to_jiffies(ms));
385} 383}
386 384
387EXPORT_SYMBOL(acpi_os_sleep);
388
389void acpi_os_stall(u32 us) 385void acpi_os_stall(u32 us)
390{ 386{
391 while (us) { 387 while (us) {
@@ -399,8 +395,6 @@ void acpi_os_stall(u32 us)
399 } 395 }
400} 396}
401 397
402EXPORT_SYMBOL(acpi_os_stall);
403
404/* 398/*
405 * Support ACPI 3.0 AML Timer operand 399 * Support ACPI 3.0 AML Timer operand
406 * Returns 64-bit free-running, monotonically increasing timer 400 * Returns 64-bit free-running, monotonically increasing timer
@@ -550,8 +544,6 @@ acpi_os_read_pci_configuration(struct acpi_pci_id * pci_id, u32 reg,
550 return (result ? AE_ERROR : AE_OK); 544 return (result ? AE_ERROR : AE_OK);
551} 545}
552 546
553EXPORT_SYMBOL(acpi_os_read_pci_configuration);
554
555acpi_status 547acpi_status
556acpi_os_write_pci_configuration(struct acpi_pci_id * pci_id, u32 reg, 548acpi_os_write_pci_configuration(struct acpi_pci_id * pci_id, u32 reg,
557 acpi_integer value, u32 width) 549 acpi_integer value, u32 width)
@@ -793,8 +785,6 @@ acpi_os_create_semaphore(u32 max_units, u32 initial_units, acpi_handle * handle)
793 return AE_OK; 785 return AE_OK;
794} 786}
795 787
796EXPORT_SYMBOL(acpi_os_create_semaphore);
797
798/* 788/*
799 * TODO: A better way to delete semaphores? Linux doesn't have a 789 * TODO: A better way to delete semaphores? Linux doesn't have a
800 * 'delete_semaphore()' function -- may result in an invalid 790 * 'delete_semaphore()' function -- may result in an invalid
@@ -818,8 +808,6 @@ acpi_status acpi_os_delete_semaphore(acpi_handle handle)
818 return AE_OK; 808 return AE_OK;
819} 809}
820 810
821EXPORT_SYMBOL(acpi_os_delete_semaphore);
822
823/* 811/*
824 * TODO: The kernel doesn't have a 'down_timeout' function -- had to 812 * TODO: The kernel doesn't have a 'down_timeout' function -- had to
825 * improvise. The process is to sleep for one scheduler quantum 813 * improvise. The process is to sleep for one scheduler quantum
@@ -912,8 +900,6 @@ acpi_status acpi_os_wait_semaphore(acpi_handle handle, u32 units, u16 timeout)
912 return status; 900 return status;
913} 901}
914 902
915EXPORT_SYMBOL(acpi_os_wait_semaphore);
916
917/* 903/*
918 * TODO: Support for units > 1? 904 * TODO: Support for units > 1?
919 */ 905 */
@@ -936,8 +922,6 @@ acpi_status acpi_os_signal_semaphore(acpi_handle handle, u32 units)
936 return AE_OK; 922 return AE_OK;
937} 923}
938 924
939EXPORT_SYMBOL(acpi_os_signal_semaphore);
940
941#ifdef ACPI_FUTURE_USAGE 925#ifdef ACPI_FUTURE_USAGE
942u32 acpi_os_get_line(char *buffer) 926u32 acpi_os_get_line(char *buffer)
943{ 927{
@@ -981,8 +965,6 @@ acpi_status acpi_os_signal(u32 function, void *info)
981 return AE_OK; 965 return AE_OK;
982} 966}
983 967
984EXPORT_SYMBOL(acpi_os_signal);
985
986static int __init acpi_os_name_setup(char *str) 968static int __init acpi_os_name_setup(char *str)
987{ 969{
988 char *p = acpi_os_name; 970 char *p = acpi_os_name;
diff --git a/drivers/acpi/pci_bind.c b/drivers/acpi/pci_bind.c
index 388300de005d..4b252ea0e952 100644
--- a/drivers/acpi/pci_bind.c
+++ b/drivers/acpi/pci_bind.c
@@ -44,6 +44,8 @@ struct acpi_pci_data {
44 struct pci_dev *dev; 44 struct pci_dev *dev;
45}; 45};
46 46
47static int acpi_pci_unbind(struct acpi_device *device);
48
47static void acpi_pci_data_handler(acpi_handle handle, u32 function, 49static void acpi_pci_data_handler(acpi_handle handle, u32 function,
48 void *context) 50 void *context)
49{ 51{
@@ -267,7 +269,7 @@ int acpi_pci_bind(struct acpi_device *device)
267 return result; 269 return result;
268} 270}
269 271
270int acpi_pci_unbind(struct acpi_device *device) 272static int acpi_pci_unbind(struct acpi_device *device)
271{ 273{
272 int result = 0; 274 int result = 0;
273 acpi_status status = AE_OK; 275 acpi_status status = AE_OK;
diff --git a/drivers/acpi/pci_irq.c b/drivers/acpi/pci_irq.c
index 62010c2481b3..822947339df1 100644
--- a/drivers/acpi/pci_irq.c
+++ b/drivers/acpi/pci_irq.c
@@ -478,8 +478,6 @@ int acpi_pci_irq_enable(struct pci_dev *dev)
478 return 0; 478 return 0;
479} 479}
480 480
481EXPORT_SYMBOL(acpi_pci_irq_enable);
482
483/* FIXME: implement x86/x86_64 version */ 481/* FIXME: implement x86/x86_64 version */
484void __attribute__ ((weak)) acpi_unregister_gsi(u32 i) 482void __attribute__ ((weak)) acpi_unregister_gsi(u32 i)
485{ 483{
diff --git a/drivers/acpi/pci_link.c b/drivers/acpi/pci_link.c
index 5400ea173f6f..233c40c51684 100644
--- a/drivers/acpi/pci_link.c
+++ b/drivers/acpi/pci_link.c
@@ -95,7 +95,7 @@ static struct {
95 int count; 95 int count;
96 struct list_head entries; 96 struct list_head entries;
97} acpi_link; 97} acpi_link;
98DEFINE_MUTEX(acpi_link_lock); 98static DEFINE_MUTEX(acpi_link_lock);
99 99
100/* -------------------------------------------------------------------------- 100/* --------------------------------------------------------------------------
101 PCI Link Device Management 101 PCI Link Device Management
diff --git a/drivers/acpi/sbs.c b/drivers/acpi/sbs.c
index f136c7d3b3c2..1194105cc3ca 100644
--- a/drivers/acpi/sbs.c
+++ b/drivers/acpi/sbs.c
@@ -888,7 +888,7 @@ static void acpi_charger_remove(struct acpi_sbs *sbs)
888#endif 888#endif
889} 889}
890 890
891void acpi_sbs_callback(void *context) 891static void acpi_sbs_callback(void *context)
892{ 892{
893 int id; 893 int id;
894 struct acpi_sbs *sbs = context; 894 struct acpi_sbs *sbs = context;
diff --git a/drivers/acpi/sbshc.c b/drivers/acpi/sbshc.c
index fd40b6a1d639..ae9a90438e2f 100644
--- a/drivers/acpi/sbshc.c
+++ b/drivers/acpi/sbshc.c
@@ -111,8 +111,8 @@ static int wait_transaction_complete(struct acpi_smb_hc *hc, int timeout)
111 return -ETIME; 111 return -ETIME;
112} 112}
113 113
114int acpi_smbus_transaction(struct acpi_smb_hc *hc, u8 protocol, u8 address, 114static int acpi_smbus_transaction(struct acpi_smb_hc *hc, u8 protocol,
115 u8 command, u8 *data, u8 length) 115 u8 address, u8 command, u8 *data, u8 length)
116{ 116{
117 int ret = -EFAULT, i; 117 int ret = -EFAULT, i;
118 u8 temp, sz = 0; 118 u8 temp, sz = 0;
diff --git a/include/acpi/acpi_drivers.h b/include/acpi/acpi_drivers.h
index f85f77a538aa..a77196bcb993 100644
--- a/include/acpi/acpi_drivers.h
+++ b/include/acpi/acpi_drivers.h
@@ -73,7 +73,6 @@ struct pci_bus;
73 73
74acpi_status acpi_get_pci_id(acpi_handle handle, struct acpi_pci_id *id); 74acpi_status acpi_get_pci_id(acpi_handle handle, struct acpi_pci_id *id);
75int acpi_pci_bind(struct acpi_device *device); 75int acpi_pci_bind(struct acpi_device *device);
76int acpi_pci_unbind(struct acpi_device *device);
77int acpi_pci_bind_root(struct acpi_device *device, struct acpi_pci_id *id, 76int acpi_pci_bind_root(struct acpi_device *device, struct acpi_pci_id *id,
78 struct pci_bus *bus); 77 struct pci_bus *bus);
79 78
diff --git a/include/acpi/acpi_numa.h b/include/acpi/acpi_numa.h
index 62c5ee4311da..173972672175 100644
--- a/include/acpi/acpi_numa.h
+++ b/include/acpi/acpi_numa.h
@@ -15,7 +15,6 @@ extern int pxm_to_node(int);
15extern int node_to_pxm(int); 15extern int node_to_pxm(int);
16extern void __acpi_map_pxm_to_node(int, int); 16extern void __acpi_map_pxm_to_node(int, int);
17extern int acpi_map_pxm_to_node(int); 17extern int acpi_map_pxm_to_node(int);
18extern void __cpuinit acpi_unmap_pxm_to_node(int);
19 18
20#endif /* CONFIG_ACPI_NUMA */ 19#endif /* CONFIG_ACPI_NUMA */
21#endif /* __ACP_NUMA_H */ 20#endif /* __ACP_NUMA_H */