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

Commit 1d5b30fc authored by Len Brown's avatar Len Brown
Browse files

Pull battery into test branch

parents c92fd49c 34c4415a

drivers/acpi/battery.c

+14 −0
Original line number Original line Diff line number Diff line
@@ -64,6 +64,7 @@ extern void *acpi_unlock_battery_dir(struct proc_dir_entry *acpi_battery_dir); 




static int acpi_battery_add(struct acpi_device *device);

static int acpi_battery_add(struct acpi_device *device);

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

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

static int acpi_battery_resume(struct acpi_device *device, int status);





static struct acpi_driver acpi_battery_driver = {

static struct acpi_driver acpi_battery_driver = {

	.name = ACPI_BATTERY_DRIVER_NAME,

	.name = ACPI_BATTERY_DRIVER_NAME,
@@ -71,6 +72,7 @@ static struct acpi_driver acpi_battery_driver = { 
	.ids = ACPI_BATTERY_HID,

	.ids = ACPI_BATTERY_HID,

	.ops = {

	.ops = {

		.add = acpi_battery_add,

		.add = acpi_battery_add,

		.resume = acpi_battery_resume,

		.remove = acpi_battery_remove,

		.remove = acpi_battery_remove,

		},

		},

};

};
@@ -753,6 +755,18 @@ static int acpi_battery_remove(struct acpi_device *device, int type) 
	return 0;

	return 0;

}

}





/* this is needed to learn about changes made in suspended state */

static int acpi_battery_resume(struct acpi_device *device, int state)

{

	struct acpi_battery *battery;



	if (!device)

		return -EINVAL;



	battery = device->driver_data;

	return acpi_battery_check(battery);

}



static int __init acpi_battery_init(void)

static int __init acpi_battery_init(void)

{

{

	int result;

	int result;

drivers/acpi/sbs.c

+13 −7
Original line number Original line Diff line number Diff line
@@ -98,11 +98,11 @@ static int update_info_mode = UPDATE_INFO_MODE; 
static int update_time = UPDATE_TIME;

static int update_time = UPDATE_TIME;

static int update_time2 = UPDATE_TIME2;

static int update_time2 = UPDATE_TIME2;





module_param(capacity_mode, int, CAPACITY_UNIT);

module_param(capacity_mode, int, 0);

module_param(update_mode, int, UPDATE_MODE);

module_param(update_mode, int, 0);

module_param(update_info_mode, int, UPDATE_INFO_MODE);

module_param(update_info_mode, int, 0);

module_param(update_time, int, UPDATE_TIME);

module_param(update_time, int, 0);

module_param(update_time2, int, UPDATE_TIME2);

module_param(update_time2, int, 0);





static int acpi_sbs_add(struct acpi_device *device);

static int acpi_sbs_add(struct acpi_device *device);

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

static int acpi_sbs_remove(struct acpi_device *device, int type);
@@ -1685,10 +1685,16 @@ static int acpi_sbs_add(struct acpi_device *device) 




int acpi_sbs_remove(struct acpi_device *device, int type)

int acpi_sbs_remove(struct acpi_device *device, int type)

{

{

	struct acpi_sbs *sbs = (struct acpi_sbs *)acpi_driver_data(device);

	struct acpi_sbs *sbs = NULL;

	int id;

	int id;





	if (!device || !sbs) {

	if (!device) {

		return -EINVAL;

	}



	sbs = (struct acpi_sbs *)acpi_driver_data(device);



	if (!sbs) {

		return -EINVAL;

		return -EINVAL;

	}

	}