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

Commit 51fac838 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

ACPI: Remove useless type argument of driver .remove() operation 



The second argument of ACPI driver .remove() operation is only used
by the ACPI processor driver and the value passed to that driver
through it is always available from the given struct acpi_device
object's removal_type field.  For this reason, the second ACPI driver
.remove() argument is in fact useless, so drop it.

Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: default avatarJiang Liu <jiang.liu@huawei.com>
Acked-by: default avatarToshi Kani <toshi.kani@hp.com>
Acked-by: default avatarYinghai Lu <yinghai@kernel.org>
parent cc38e519

arch/ia64/hp/common/aml_nfw.c

+1 −1
Original line number Diff line number Diff line
@@ -191,7 +191,7 @@ static int aml_nfw_add(struct acpi_device *device) 
	return aml_nfw_add_global_handler();

}



static int aml_nfw_remove(struct acpi_device *device, int type)

static int aml_nfw_remove(struct acpi_device *device)

{

	return aml_nfw_remove_global_handler();

}

arch/x86/platform/olpc/olpc-xo15-sci.c

+1 −1
Original line number Diff line number Diff line
@@ -195,7 +195,7 @@ static int xo15_sci_add(struct acpi_device *device) 
	return r;

}



static int xo15_sci_remove(struct acpi_device *device, int type)

static int xo15_sci_remove(struct acpi_device *device)

{

	acpi_disable_gpe(NULL, xo15_sci_gpe);

	acpi_remove_gpe_handler(NULL, xo15_sci_gpe, xo15_sci_gpe_handler);

drivers/acpi/ac.c

+2 −2
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ static int acpi_ac_open_fs(struct inode *inode, struct file *file); 
#endif



static int acpi_ac_add(struct acpi_device *device);

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

static int acpi_ac_remove(struct acpi_device *device);

static void acpi_ac_notify(struct acpi_device *device, u32 event);



static const struct acpi_device_id ac_device_ids[] = {
@@ -337,7 +337,7 @@ static int acpi_ac_resume(struct device *dev) 
}

#endif



static int acpi_ac_remove(struct acpi_device *device, int type)

static int acpi_ac_remove(struct acpi_device *device)

{

	struct acpi_ac *ac = NULL;

drivers/acpi/acpi_memhotplug.c

+2 −2
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ MODULE_LICENSE("GPL"); 
#define MEMORY_POWER_OFF_STATE	2



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_remove(struct acpi_device *device);



static const struct acpi_device_id memory_device_ids[] = {

	{ACPI_MEMORY_DEVICE_HID, 0},
@@ -415,7 +415,7 @@ static int acpi_memory_device_add(struct acpi_device *device) 
	return result;

}



static int acpi_memory_device_remove(struct acpi_device *device, int type)

static int acpi_memory_device_remove(struct acpi_device *device)

{

	struct acpi_memory_device *mem_device = NULL;

	int result;

drivers/acpi/acpi_pad.c

+1 −2
Original line number Diff line number Diff line
@@ -482,8 +482,7 @@ static int acpi_pad_add(struct acpi_device *device) 
	return 0;

}



static int acpi_pad_remove(struct acpi_device *device,

	int type)

static int acpi_pad_remove(struct acpi_device *device)

{

	mutex_lock(&isolated_cpus_lock);

	acpi_pad_idle_cpus(0);