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

Commit c0ce093f authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Len Brown
Browse files

ACPI: remove unused acpi_device_ops .shutdown method 



No drivers use the .shutdown method, so remove it.

Signed-off-by: default avatarBjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 93b3e78a

drivers/acpi/scan.c

+0 −12
Original line number Original line Diff line number Diff line
@@ -395,22 +395,10 @@ static int acpi_device_remove(struct device * dev) 
	return 0;

	return 0;

}

}





static void acpi_device_shutdown(struct device *dev)

{

	struct acpi_device *acpi_dev = to_acpi_device(dev);

	struct acpi_driver *acpi_drv = acpi_dev->driver;



	if (acpi_drv && acpi_drv->ops.shutdown)

		acpi_drv->ops.shutdown(acpi_dev);



	return ;

}



struct bus_type acpi_bus_type = {

struct bus_type acpi_bus_type = {

	.name		= "acpi",

	.name		= "acpi",

	.suspend	= acpi_device_suspend,

	.suspend	= acpi_device_suspend,

	.resume		= acpi_device_resume,

	.resume		= acpi_device_resume,

	.shutdown	= acpi_device_shutdown,

	.match		= acpi_bus_match,

	.match		= acpi_bus_match,

	.probe		= acpi_device_probe,

	.probe		= acpi_device_probe,

	.remove		= acpi_device_remove,

	.remove		= acpi_device_remove,

include/acpi/acpi_bus.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -95,7 +95,6 @@ typedef int (*acpi_op_suspend) (struct acpi_device * device, 
typedef int (*acpi_op_resume) (struct acpi_device * device);

typedef int (*acpi_op_resume) (struct acpi_device * device);

typedef int (*acpi_op_bind) (struct acpi_device * device);

typedef int (*acpi_op_bind) (struct acpi_device * device);

typedef int (*acpi_op_unbind) (struct acpi_device * device);

typedef int (*acpi_op_unbind) (struct acpi_device * device);

typedef int (*acpi_op_shutdown) (struct acpi_device * device);





struct acpi_bus_ops {

struct acpi_bus_ops {

	u32 acpi_op_add:1;

	u32 acpi_op_add:1;
@@ -121,7 +120,6 @@ struct acpi_device_ops { 
	acpi_op_resume resume;

	acpi_op_resume resume;

	acpi_op_bind bind;

	acpi_op_bind bind;

	acpi_op_unbind unbind;

	acpi_op_unbind unbind;

	acpi_op_shutdown shutdown;

};

};





struct acpi_driver {

struct acpi_driver {