diff options
author | Rafael J. Wysocki <rjw@sisk.pl> | 2011-03-12 16:16:51 -0500 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2011-03-18 18:22:21 -0400 |
commit | c3146df2b735912eddd1d7c080c9377d5df0ae94 (patch) | |
tree | 536c3fafb022351d29dfa08c5ea5fc5585fb6033 /drivers/acpi | |
parent | 4d3fbff26c8e91474e30e575c2b7476be11afd83 (diff) |
ACPI: Use syscore_ops instead of sysdev class and sysdev
ACPI uses a sysdev class and a sysdev for executing
irqrouter_resume() before turning on interrupts on the boot CPU.
However, since irqrouter_resume() ignores its argument, the entire
mechanism may be replaced with a struct syscore_ops object which
is considerably simpler.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi')
-rw-r--r-- | drivers/acpi/pci_link.c | 30 |
1 files changed, 8 insertions, 22 deletions
diff --git a/drivers/acpi/pci_link.c b/drivers/acpi/pci_link.c index 9ff80a7e9f6a..4a29763b8eb4 100644 --- a/drivers/acpi/pci_link.c +++ b/drivers/acpi/pci_link.c | |||
@@ -29,7 +29,7 @@ | |||
29 | * for IRQ management (e.g. start()->_SRS). | 29 | * for IRQ management (e.g. start()->_SRS). |
30 | */ | 30 | */ |
31 | 31 | ||
32 | #include <linux/sysdev.h> | 32 | #include <linux/syscore_ops.h> |
33 | #include <linux/kernel.h> | 33 | #include <linux/kernel.h> |
34 | #include <linux/module.h> | 34 | #include <linux/module.h> |
35 | #include <linux/init.h> | 35 | #include <linux/init.h> |
@@ -757,14 +757,13 @@ static int acpi_pci_link_resume(struct acpi_pci_link *link) | |||
757 | return 0; | 757 | return 0; |
758 | } | 758 | } |
759 | 759 | ||
760 | static int irqrouter_resume(struct sys_device *dev) | 760 | static void irqrouter_resume(void) |
761 | { | 761 | { |
762 | struct acpi_pci_link *link; | 762 | struct acpi_pci_link *link; |
763 | 763 | ||
764 | list_for_each_entry(link, &acpi_link_list, list) { | 764 | list_for_each_entry(link, &acpi_link_list, list) { |
765 | acpi_pci_link_resume(link); | 765 | acpi_pci_link_resume(link); |
766 | } | 766 | } |
767 | return 0; | ||
768 | } | 767 | } |
769 | 768 | ||
770 | static int acpi_pci_link_remove(struct acpi_device *device, int type) | 769 | static int acpi_pci_link_remove(struct acpi_device *device, int type) |
@@ -871,32 +870,19 @@ static int __init acpi_irq_balance_set(char *str) | |||
871 | 870 | ||
872 | __setup("acpi_irq_balance", acpi_irq_balance_set); | 871 | __setup("acpi_irq_balance", acpi_irq_balance_set); |
873 | 872 | ||
874 | /* FIXME: we will remove this interface after all drivers call pci_disable_device */ | 873 | static struct syscore_ops irqrouter_syscore_ops = { |
875 | static struct sysdev_class irqrouter_sysdev_class = { | ||
876 | .name = "irqrouter", | ||
877 | .resume = irqrouter_resume, | 874 | .resume = irqrouter_resume, |
878 | }; | 875 | }; |
879 | 876 | ||
880 | static struct sys_device device_irqrouter = { | 877 | static int __init irqrouter_init_ops(void) |
881 | .id = 0, | ||
882 | .cls = &irqrouter_sysdev_class, | ||
883 | }; | ||
884 | |||
885 | static int __init irqrouter_init_sysfs(void) | ||
886 | { | 878 | { |
887 | int error; | 879 | if (!acpi_disabled && !acpi_noirq) |
880 | register_syscore_ops(&irqrouter_syscore_ops); | ||
888 | 881 | ||
889 | if (acpi_disabled || acpi_noirq) | 882 | return 0; |
890 | return 0; | ||
891 | |||
892 | error = sysdev_class_register(&irqrouter_sysdev_class); | ||
893 | if (!error) | ||
894 | error = sysdev_register(&device_irqrouter); | ||
895 | |||
896 | return error; | ||
897 | } | 883 | } |
898 | 884 | ||
899 | device_initcall(irqrouter_init_sysfs); | 885 | device_initcall(irqrouter_init_ops); |
900 | 886 | ||
901 | static int __init acpi_pci_link_init(void) | 887 | static int __init acpi_pci_link_init(void) |
902 | { | 888 | { |