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

Commit 323ef30a authored by Len Brown's avatar Len Brown
Browse files

Pull auto-load-modules into release branch

parents cb3e0c10 1ba90e3a

drivers/acpi/ac.c

+7 −2
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ 


#define ACPI_AC_COMPONENT		0x00020000

#define ACPI_AC_CLASS			"ac_adapter"

#define ACPI_AC_HID 			"ACPI0003"

#define ACPI_AC_DEVICE_NAME		"AC Adapter"

#define ACPI_AC_FILE_STATE		"state"

#define ACPI_AC_NOTIFY_STATUS		0x80
@@ -56,10 +55,16 @@ static int acpi_ac_add(struct acpi_device *device); 
static int acpi_ac_remove(struct acpi_device *device, int type);

static int acpi_ac_open_fs(struct inode *inode, struct file *file);



const static struct acpi_device_id ac_device_ids[] = {

	{"ACPI0003", 0},

	{"", 0},

};

MODULE_DEVICE_TABLE(acpi, ac_device_ids);



static struct acpi_driver acpi_ac_driver = {

	.name = "ac",

	.class = ACPI_AC_CLASS,

	.ids = ACPI_AC_HID,

	.ids = ac_device_ids,

	.ops = {

		.add = acpi_ac_add,

		.remove = acpi_ac_remove,

drivers/acpi/acpi_memhotplug.c

+7 −1
Original line number Diff line number Diff line
@@ -53,10 +53,16 @@ static int acpi_memory_device_add(struct acpi_device *device); 
static int acpi_memory_device_remove(struct acpi_device *device, int type);

static int acpi_memory_device_start(struct acpi_device *device);



static const struct acpi_device_id memory_device_ids[] = {

	{ACPI_MEMORY_DEVICE_HID, 0},

	{"", 0},

};

MODULE_DEVICE_TABLE(acpi, memory_device_ids);



static struct acpi_driver acpi_memory_device_driver = {

	.name = "acpi_memhotplug",

	.class = ACPI_MEMORY_DEVICE_CLASS,

	.ids = ACPI_MEMORY_DEVICE_HID,

	.ids = memory_device_ids,

	.ops = {

		.add = acpi_memory_device_add,

		.remove = acpi_memory_device_remove,

drivers/acpi/asus_acpi.c

+8 −3
Original line number Diff line number Diff line
@@ -56,7 +56,6 @@ 
#define ACPI_HOTK_NAME          "Asus Laptop ACPI Extras Driver"

#define ACPI_HOTK_CLASS         "hotkey"

#define ACPI_HOTK_DEVICE_NAME   "Hotkey"

#define ACPI_HOTK_HID           "ATK0100"



/*

 * Some events we use, same for all Asus
@@ -426,14 +425,20 @@ static struct acpi_table_header *asus_info; 
static struct asus_hotk *hotk;



/*

 * The hotkey driver declaration

 * The hotkey driver and autoloading declaration

 */

static int asus_hotk_add(struct acpi_device *device);

static int asus_hotk_remove(struct acpi_device *device, int type);

static const struct acpi_device_id asus_device_ids[] = {

	{"ATK0100", 0},

	{"", 0},

};

MODULE_DEVICE_TABLE(acpi, asus_device_ids);



static struct acpi_driver asus_hotk_driver = {

	.name = "asus_acpi",

	.class = ACPI_HOTK_CLASS,

	.ids = ACPI_HOTK_HID,

	.ids = asus_device_ids,

	.ops = {

		.add = asus_hotk_add,

		.remove = asus_hotk_remove,

drivers/acpi/battery.c

+7 −2
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ 


#define ACPI_BATTERY_COMPONENT		0x00040000

#define ACPI_BATTERY_CLASS		"battery"

#define ACPI_BATTERY_HID		"PNP0C0A"

#define ACPI_BATTERY_DEVICE_NAME	"Battery"

#define ACPI_BATTERY_NOTIFY_STATUS	0x80

#define ACPI_BATTERY_NOTIFY_INFO	0x81
@@ -74,10 +73,16 @@ static int acpi_battery_add(struct acpi_device *device); 
static int acpi_battery_remove(struct acpi_device *device, int type);

static int acpi_battery_resume(struct acpi_device *device);



static const struct acpi_device_id battery_device_ids[] = {

	{"PNP0C0A", 0},

	{"", 0},

};

MODULE_DEVICE_TABLE(acpi, battery_device_ids);



static struct acpi_driver acpi_battery_driver = {

	.name = "battery",

	.class = ACPI_BATTERY_CLASS,

	.ids = ACPI_BATTERY_HID,

	.ids = battery_device_ids,

	.ops = {

		.add = acpi_battery_add,

		.resume = acpi_battery_resume,

drivers/acpi/button.c

+11 −1
Original line number Diff line number Diff line
@@ -66,6 +66,16 @@ MODULE_AUTHOR("Paul Diefenbaugh"); 
MODULE_DESCRIPTION("ACPI Button Driver");

MODULE_LICENSE("GPL");



static const struct acpi_device_id button_device_ids[] = {

	{ACPI_BUTTON_HID_LID,    0},

	{ACPI_BUTTON_HID_SLEEP,  0},

	{ACPI_BUTTON_HID_SLEEPF, 0},

	{ACPI_BUTTON_HID_POWER,  0},

	{ACPI_BUTTON_HID_POWERF, 0},

	{"", 0},

};

MODULE_DEVICE_TABLE(acpi, button_device_ids);



static int acpi_button_add(struct acpi_device *device);

static int acpi_button_remove(struct acpi_device *device, int type);

static int acpi_button_info_open_fs(struct inode *inode, struct file *file);
@@ -74,7 +84,7 @@ static int acpi_button_state_open_fs(struct inode *inode, struct file *file); 
static struct acpi_driver acpi_button_driver = {

	.name = "button",

	.class = ACPI_BUTTON_CLASS,

	.ids = "button_power,button_sleep,PNP0C0D,PNP0C0C,PNP0C0E",

	.ids = button_device_ids,

	.ops = {

		.add = acpi_button_add,

		.remove = acpi_button_remove,