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

Commit cece9014 authored by Len Brown's avatar Len Brown
Browse files

Pull style into test branch 

Conflicts:

	drivers/acpi/button.c
	drivers/acpi/ec.c
	drivers/acpi/osl.c
	drivers/acpi/sbs.c
parents cfee47f9 50dd0969

drivers/acpi/ac.c

+3 −3
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ static struct proc_dir_entry *acpi_ac_dir; 


static int acpi_ac_seq_show(struct seq_file *seq, void *offset)

{

	struct acpi_ac *ac = (struct acpi_ac *)seq->private;

	struct acpi_ac *ac = seq->private;





	if (!ac)
@@ -187,7 +187,7 @@ static int acpi_ac_remove_fs(struct acpi_device *device) 


static void acpi_ac_notify(acpi_handle handle, u32 event, void *data)

{

	struct acpi_ac *ac = (struct acpi_ac *)data;

	struct acpi_ac *ac = data;

	struct acpi_device *device = NULL;
@@ -269,7 +269,7 @@ static int acpi_ac_remove(struct acpi_device *device, int type) 
	if (!device || !acpi_driver_data(device))

		return -EINVAL;



	ac = (struct acpi_ac *)acpi_driver_data(device);

	ac = acpi_driver_data(device);



	status = acpi_remove_notify_handler(device->handle,

					    ACPI_ALL_NOTIFY, acpi_ac_notify);

drivers/acpi/acpi_memhotplug.c

+1 −1
Original line number Diff line number Diff line
@@ -429,7 +429,7 @@ static int acpi_memory_device_remove(struct acpi_device *device, int type) 
	if (!device || !acpi_driver_data(device))

		return -EINVAL;



	mem_device = (struct acpi_memory_device *)acpi_driver_data(device);

	mem_device = acpi_driver_data(device);

	kfree(mem_device);



	return 0;

drivers/acpi/asus_acpi.c

+3 −4
Original line number Diff line number Diff line
@@ -1146,7 +1146,7 @@ static int asus_hotk_get_info(void) 
	if (ACPI_FAILURE(status))

		printk(KERN_WARNING "  Couldn't get the DSDT table header\n");

	else

		asus_info = (struct acpi_table_header *)dsdt.pointer;

		asus_info = dsdt.pointer;



	/* We have to write 0 on init this far for all ASUS models */

	if (!write_acpi_int(hotk->handle, "INIT", 0, &buffer)) {
@@ -1168,7 +1168,7 @@ static int asus_hotk_get_info(void) 
	 * asus_model_match() and try something completely different.

	 */

	if (buffer.pointer) {

		model = (union acpi_object *)buffer.pointer;

		model = buffer.pointer;

		switch (model->type) {

		case ACPI_TYPE_STRING:

			string = model->string.pointer;
@@ -1264,8 +1264,7 @@ static int asus_hotk_add(struct acpi_device *device) 
	printk(KERN_NOTICE "Asus Laptop ACPI Extras version %s\n",

	       ASUS_ACPI_VERSION);



	hotk =

	    (struct asus_hotk *)kmalloc(sizeof(struct asus_hotk), GFP_KERNEL);

	hotk = kmalloc(sizeof(struct asus_hotk), GFP_KERNEL);

	if (!hotk)

		return -ENOMEM;

	memset(hotk, 0, sizeof(struct asus_hotk));

drivers/acpi/battery.c

+11 −11
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ acpi_battery_get_info(struct acpi_battery *battery, 
		return -ENODEV;

	}



	package = (union acpi_object *)buffer.pointer;

	package = buffer.pointer;



	/* Extract Package Data */
@@ -179,7 +179,7 @@ acpi_battery_get_info(struct acpi_battery *battery, 
	kfree(buffer.pointer);



	if (!result)

		(*bif) = (struct acpi_battery_info *)data.pointer;

		(*bif) = data.pointer;



	return result;

}
@@ -209,7 +209,7 @@ acpi_battery_get_status(struct acpi_battery *battery, 
		return -ENODEV;

	}



	package = (union acpi_object *)buffer.pointer;

	package = buffer.pointer;



	/* Extract Package Data */
@@ -239,7 +239,7 @@ acpi_battery_get_status(struct acpi_battery *battery, 
	kfree(buffer.pointer);



	if (!result)

		(*bst) = (struct acpi_battery_status *)data.pointer;

		(*bst) = data.pointer;



	return result;

}
@@ -334,7 +334,7 @@ static struct proc_dir_entry *acpi_battery_dir; 
static int acpi_battery_read_info(struct seq_file *seq, void *offset)

{

	int result = 0;

	struct acpi_battery *battery = (struct acpi_battery *)seq->private;

	struct acpi_battery *battery = seq->private;

	struct acpi_battery_info *bif = NULL;

	char *units = "?";
@@ -418,7 +418,7 @@ static int acpi_battery_info_open_fs(struct inode *inode, struct file *file) 
static int acpi_battery_read_state(struct seq_file *seq, void *offset)

{

	int result = 0;

	struct acpi_battery *battery = (struct acpi_battery *)seq->private;

	struct acpi_battery *battery = seq->private;

	struct acpi_battery_status *bst = NULL;

	char *units = "?";
@@ -494,7 +494,7 @@ static int acpi_battery_state_open_fs(struct inode *inode, struct file *file) 


static int acpi_battery_read_alarm(struct seq_file *seq, void *offset)

{

	struct acpi_battery *battery = (struct acpi_battery *)seq->private;

	struct acpi_battery *battery = seq->private;

	char *units = "?";
@@ -531,8 +531,8 @@ acpi_battery_write_alarm(struct file *file, 
{

	int result = 0;

	char alarm_string[12] = { '\0' };

	struct seq_file *m = (struct seq_file *)file->private_data;

	struct acpi_battery *battery = (struct acpi_battery *)m->private;

	struct seq_file *m = file->private_data;

	struct acpi_battery *battery = m->private;





	if (!battery || (count > sizeof(alarm_string) - 1))
@@ -658,7 +658,7 @@ static int acpi_battery_remove_fs(struct acpi_device *device) 


static void acpi_battery_notify(acpi_handle handle, u32 event, void *data)

{

	struct acpi_battery *battery = (struct acpi_battery *)data;

	struct acpi_battery *battery = data;

	struct acpi_device *device = NULL;
@@ -742,7 +742,7 @@ static int acpi_battery_remove(struct acpi_device *device, int type) 
	if (!device || !acpi_driver_data(device))

		return -EINVAL;



	battery = (struct acpi_battery *)acpi_driver_data(device);

	battery = acpi_driver_data(device);



	status = acpi_remove_notify_handler(device->handle,

					    ACPI_ALL_NOTIFY,

drivers/acpi/container.c

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ static int acpi_container_remove(struct acpi_device *device, int type) 
	acpi_status status = AE_OK;

	struct acpi_container *pc = NULL;



	pc = (struct acpi_container *)acpi_driver_data(device);

	pc = acpi_driver_data(device);

	kfree(pc);

	return status;

}