Merge branch 'sysdev' into release

diff --git a/drivers/acpi/ec_sys.c b/drivers/acpi/ec_sys.c
index 411620ef84c2e83811adc73c8cd255f58a99549b..05b44201a61476988475fce1fea5d6b817e0565d 100644 (file)
--- a/drivers/acpi/ec_sys.c
+++ b/drivers/acpi/ec_sys.c
@@ -24,10 +24,6 @@ MODULE_PARM_DESC(write_support, "Dangerous, reboot and removal of battery may "
 
 #define EC_SPACE_SIZE 256
 
-struct sysdev_class acpi_ec_sysdev_class = {
-       .name = "ec",
-};
-
 static struct dentry *acpi_ec_debugfs_dir;
 
 static int acpi_ec_open_io(struct inode *i, struct file *f)

diff --git a/drivers/acpi/internal.h b/drivers/acpi/internal.h
index b1cc81a0431b600653011a284228424b50ac5e83..4bfb759deb104e6febcf837a84d52c3cb39916a3 100644 (file)
--- a/drivers/acpi/internal.h
+++ b/drivers/acpi/internal.h
@@ -21,8 +21,6 @@
 #ifndef _ACPI_INTERNAL_H_
 #define _ACPI_INTERNAL_H_
 
-#include <linux/sysdev.h>
-
 #define PREFIX "ACPI: "
 
 int init_acpi_device_notify(void);
@@ -64,7 +62,6 @@ struct acpi_ec {
        struct list_head list;
        struct transaction *curr;
        spinlock_t curr_lock;
-       struct sys_device sysdev;
 };
 
 extern struct acpi_ec *first_ec;

diff --git a/drivers/acpi/pci_link.c b/drivers/acpi/pci_link.c
index 9ff80a7e9f6ada0aef1c57bea5e3f6b142037de5..4a29763b8eb454b28c59c9257c893ac0fadc5599 100644 (file)
--- a/drivers/acpi/pci_link.c
+++ b/drivers/acpi/pci_link.c
@@ -29,7 +29,7 @@
  *        for IRQ management (e.g. start()->_SRS).
  */
 
-#include <linux/sysdev.h>
+#include <linux/syscore_ops.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/init.h>
@@ -757,14 +757,13 @@ static int acpi_pci_link_resume(struct acpi_pci_link *link)
        return 0;
 }
 
-static int irqrouter_resume(struct sys_device *dev)
+static void irqrouter_resume(void)
 {
        struct acpi_pci_link *link;
 
        list_for_each_entry(link, &acpi_link_list, list) {
                acpi_pci_link_resume(link);
        }
-       return 0;
 }
 
 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)
 
 __setup("acpi_irq_balance", acpi_irq_balance_set);
 
-/* FIXME: we will remove this interface after all drivers call pci_disable_device */
-static struct sysdev_class irqrouter_sysdev_class = {
-       .name = "irqrouter",
+static struct syscore_ops irqrouter_syscore_ops = {
        .resume = irqrouter_resume,
 };
 
-static struct sys_device device_irqrouter = {
-       .id = 0,
-       .cls = &irqrouter_sysdev_class,
-};
-
-static int __init irqrouter_init_sysfs(void)
+static int __init irqrouter_init_ops(void)
 {
-       int error;
+       if (!acpi_disabled && !acpi_noirq)
+               register_syscore_ops(&irqrouter_syscore_ops);
 
-       if (acpi_disabled || acpi_noirq)
-               return 0;
-
-       error = sysdev_class_register(&irqrouter_sysdev_class);
-       if (!error)
-               error = sysdev_register(&device_irqrouter);
-
-       return error;
+       return 0;
 }
 
-device_initcall(irqrouter_init_sysfs);
+device_initcall(irqrouter_init_ops);
 
 static int __init acpi_pci_link_init(void)
 {