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

Commit 50dd0969 authored by Jan Engelhardt's avatar Jan Engelhardt Committed by Len Brown
Browse files

ACPI: Remove unnecessary from/to-void* and to-void casts in drivers/acpi 



Signed-off-by: default avatarJan Engelhardt <jengelh@gmx.de>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent b4bd8c66

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
@@ -427,7 +427,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
@@ -1128,7 +1128,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)) {
@@ -1150,7 +1150,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;
@@ -1245,8 +1245,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
@@ -147,7 +147,7 @@ acpi_battery_get_info(struct acpi_battery *battery, 
		return -ENODEV;

	}



	package = (union acpi_object *)buffer.pointer;

	package = buffer.pointer;



	/* Extract Package Data */
@@ -177,7 +177,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;

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

	}



	package = (union acpi_object *)buffer.pointer;

	package = buffer.pointer;



	/* Extract Package Data */
@@ -237,7 +237,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;

}
@@ -332,7 +332,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 = "?";
@@ -416,7 +416,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 = "?";
@@ -492,7 +492,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 = "?";
@@ -529,8 +529,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))
@@ -656,7 +656,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;
@@ -740,7 +740,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/button.c

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


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

{

	struct acpi_button *button = (struct acpi_button *)seq->private;

	struct acpi_button *button = seq->private;





	if (!button || !button->device)
@@ -128,7 +128,7 @@ static int acpi_button_info_open_fs(struct inode *inode, struct file *file) 


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

{

	struct acpi_button *button = (struct acpi_button *)seq->private;

	struct acpi_button *button = seq->private;

	acpi_status status;

	unsigned long state;
@@ -253,7 +253,7 @@ static int acpi_button_remove_fs(struct acpi_device *device) 


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

{

	struct acpi_button *button = (struct acpi_button *)data;

	struct acpi_button *button = data;





	if (!button || !button->device)
@@ -275,7 +275,7 @@ static void acpi_button_notify(acpi_handle handle, u32 event, void *data) 


static acpi_status acpi_button_notify_fixed(void *data)

{

	struct acpi_button *button = (struct acpi_button *)data;

	struct acpi_button *button = data;





	if (!button)