Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3d26678e authored by Len Brown's avatar Len Brown
Browse files

Merge branch 'sysdev' into release

parents 02e24078 c3146df2

drivers/acpi/ec_sys.c

+0 −4
Original line number Diff line number Diff line
@@ -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)

drivers/acpi/internal.h

+0 −3
Original line number Diff line number Diff line
@@ -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;

drivers/acpi/pci_link.c

+8 −22
Original line number Diff line number Diff line
@@ -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;

}



device_initcall(irqrouter_init_sysfs);

device_initcall(irqrouter_init_ops);



static int __init acpi_pci_link_init(void)

{