Subject: [PATCH] [acpi driver model] Move ACPI driver definition to new file - Create include/acpi/driver.h. - Move definition of struct acpi_device_driver there. - Update drivers/acpi/drivers/core/core.h. Signed-off-by: Patrick Mochel --- drivers/acpi/drivers/core/core.h | 2 +- include/acpi/device.h | 18 ------------------ include/acpi/driver.h | 27 +++++++++++++++++++++++++++ 3 files changed, 28 insertions(+), 19 deletions(-) create mode 100644 include/acpi/driver.h applies-to: ce9b5b774562f47398f5b2b7052cf7453a0b6407 147ae341e11c6fbac0294ae32c7dec6e5b9440b9 diff --git a/drivers/acpi/drivers/core/core.h b/drivers/acpi/drivers/core/core.h index a140482..fcdd6f5 100644 --- a/drivers/acpi/drivers/core/core.h +++ b/drivers/acpi/drivers/core/core.h @@ -1,4 +1,4 @@ -#include +#include #define DEBUG diff --git a/include/acpi/device.h b/include/acpi/device.h index acafa46..cc73020 100644 --- a/include/acpi/device.h +++ b/include/acpi/device.h @@ -12,24 +12,6 @@ struct acpi_dev { }; -struct acpi_device_driver { - const char ** d_ids; - const u32 d_num_ids; - - - int (*d_add) (struct acpi_dev * ad); - int (*d_remove) (struct acpi_dev * ad); - - int (*d_start) (struct acpi_dev * ad); - int (*d_stop) (struct acpi_dev * ad); - - void (*d_shutdown) (struct acpi_dev * ad); - int (*d_suspend) (struct acpi_dev * ad, u32 state); - int (*d_resume) (struct acpi_dev * ad); - - struct device_driver d_drv; -}; - /* * Library functions for new drivers diff --git a/include/acpi/driver.h b/include/acpi/driver.h new file mode 100644 index 0000000..b387aa8 --- /dev/null +++ b/include/acpi/driver.h @@ -0,0 +1,27 @@ + +#ifndef _INCLUDE_ACPI_DRIVER_ +#define _INCLUDE_ACPI_DRIVER_ + +#include + + +struct acpi_device_driver { + const char ** d_ids; + const u32 d_num_ids; + + + int (*d_add) (struct acpi_dev * ad); + int (*d_remove) (struct acpi_dev * ad); + + int (*d_start) (struct acpi_dev * ad); + int (*d_stop) (struct acpi_dev * ad); + + void (*d_shutdown) (struct acpi_dev * ad); + int (*d_suspend) (struct acpi_dev * ad, u32 state); + int (*d_resume) (struct acpi_dev * ad); + + struct device_driver d_drv; +}; + + +#endif /* _INCLUDE_ACPI_DRIVER_ */ --- 0.99.9.GIT