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

Commit 9ea7d575 authored by Vladimir Lebedev's avatar Vladimir Lebedev Committed by Len Brown
Browse files

ACPI: battery: Lindent 



Signed-off-by: default avatarVladimir Lebedev <vladimir.p.lebedev@intel.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent b6ce4083

drivers/acpi/battery.c

+23 −13
Original line number Diff line number Diff line
@@ -241,7 +241,9 @@ static int acpi_battery_get_info(struct acpi_battery *battery) 


	/* Evalute _BIF */



	status = acpi_evaluate_object(acpi_battery_handle(battery), "_BIF", NULL, &buffer);

	status =

	    acpi_evaluate_object(acpi_battery_handle(battery), "_BIF", NULL,

				 &buffer);

	if (ACPI_FAILURE(status)) {

		ACPI_EXCEPTION((AE_INFO, status, "Evaluating _BIF"));

		return -ENODEV;
@@ -253,7 +255,9 @@ static int acpi_battery_get_info(struct acpi_battery *battery) 


	/* Extract Package Data */



	result = acpi_battery_extract_package(battery, package, &format, data, "_BIF");

	result =

	    acpi_battery_extract_package(battery, package, &format, data,

					 "_BIF");

	if (result)

		goto end;
@@ -289,7 +293,9 @@ static int acpi_battery_get_state(struct acpi_battery *battery) 


	/* Evalute _BST */



	status = acpi_evaluate_object(acpi_battery_handle(battery), "_BST", NULL, &buffer);

	status =

	    acpi_evaluate_object(acpi_battery_handle(battery), "_BST", NULL,

				 &buffer);

	if (ACPI_FAILURE(status)) {

		ACPI_EXCEPTION((AE_INFO, status, "Evaluating _BST"));

		return -ENODEV;
@@ -301,7 +307,9 @@ static int acpi_battery_get_state(struct acpi_battery *battery) 


	/* Extract Package Data */



	result = acpi_battery_extract_package(battery, package, &format, data, "_BST");

	result =

	    acpi_battery_extract_package(battery, package, &format, data,

					 "_BST");

	if (result)

		goto end;
@@ -320,7 +328,8 @@ static int acpi_battery_get_alarm(struct acpi_battery *battery) 
	return 0;

}



static int acpi_battery_set_alarm(struct acpi_battery *battery, unsigned long alarm)

static int acpi_battery_set_alarm(struct acpi_battery *battery,

				  unsigned long alarm)

{

	acpi_status status = 0;

	union acpi_object arg0 = { ACPI_TYPE_INTEGER };
@@ -336,7 +345,9 @@ static int acpi_battery_set_alarm(struct acpi_battery *battery, unsigned long al 


	arg0.integer.value = alarm;



	status = acpi_evaluate_object(acpi_battery_handle(battery), "_BTP", &arg_list, NULL);

	status =

	    acpi_evaluate_object(acpi_battery_handle(battery), "_BTP",

				 &arg_list, NULL);

	if (ACPI_FAILURE(status))

		return -ENODEV;
@@ -418,7 +429,8 @@ static int acpi_battery_update(struct acpi_battery *battery, 
		result = acpi_battery_get_status(battery);

		if (result)

			goto end;;

		if (acpi_battery_inserted(battery) || acpi_battery_removed(battery)) {

		if (acpi_battery_inserted(battery)

		    || acpi_battery_removed(battery)) {

			result = acpi_battery_init_update(battery);

			if (result)

				goto end;;
@@ -770,7 +782,6 @@ acpi_battery_write_alarm(struct file *file, 
	struct acpi_battery *battery = m->private;

	int update_result = ACPI_BATTERY_NONE_UPDATE;





	if (!battery || (count > sizeof(alarm_string) - 1))

		return -EINVAL;
@@ -845,7 +856,6 @@ static int acpi_battery_add_fs(struct acpi_device *device) 
{

	struct proc_dir_entry *entry = NULL;





	if (!acpi_device_dir(device)) {

		acpi_device_dir(device) = proc_mkdir(acpi_device_bid(device),

						     acpi_battery_dir);
@@ -917,7 +927,6 @@ static void acpi_battery_notify(acpi_handle handle, u32 event, void *data) 
	struct acpi_battery *battery = data;

	struct acpi_device *device = NULL;





	if (!battery)

		return;
@@ -932,7 +941,8 @@ static void acpi_battery_notify(acpi_handle handle, u32 event, void *data) 
		device = battery->device;

		acpi_battery_notify_update(battery);

		acpi_battery_mutex_unlock(battery);

		acpi_bus_generate_event(device, event, acpi_battery_present(battery));

		acpi_bus_generate_event(device, event,

					acpi_battery_present(battery));

		break;

	default:

		ACPI_DEBUG_PRINT((ACPI_DB_INFO,