evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'sysdev' into release

Browse source
This commit is contained in:
Len Brown 2011-03-23 02:35:02 -04:00
commit 3d26678e80
3 changed files with 8 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/acpi/ec_sys.c
View file

@ -24,10 +24,6 @@ MODULE_PARM_DESC(write_support, "Dangerous, reboot and removal of battery may "
#define EC_SPACE_SIZE 256 #define EC_SPACE_SIZE 256
struct sysdev_class acpi_ec_sysdev_class = {
.name = "ec",
};
static struct dentry *acpi_ec_debugfs_dir; static struct dentry *acpi_ec_debugfs_dir;
static int acpi_ec_open_io(struct inode *i, struct file *f) static int acpi_ec_open_io(struct inode *i, struct file *f)

3
drivers/acpi/internal.h
View file

@ -21,8 +21,6 @@
#ifndef _ACPI_INTERNAL_H_ #ifndef _ACPI_INTERNAL_H_
#define _ACPI_INTERNAL_H_ #define _ACPI_INTERNAL_H_
#include <linux/sysdev.h>
#define PREFIX "ACPI: " #define PREFIX "ACPI: "
int init_acpi_device_notify(void); int init_acpi_device_notify(void);
@ -64,7 +62,6 @@ struct acpi_ec {
struct list_head list; struct list_head list;
struct transaction *curr; struct transaction *curr;
spinlock_t curr_lock; spinlock_t curr_lock;
struct sys_device sysdev;
}; };
extern struct acpi_ec *first_ec; extern struct acpi_ec *first_ec;

30
drivers/acpi/pci_link.c
View file

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