--- zzzz-none-000/linux-3.10.107/include/linux/acpi.h 2017-06-27 09:49:32.000000000 +0000 +++ vr9-7490-729/linux-3.10.107/include/linux/acpi.h 2021-11-10 11:53:56.000000000 +0000 @@ -429,31 +429,35 @@ return 0; } -static inline int acpi_check_resource_conflict(struct resource *res) +static inline int acpi_check_resource_conflict( + struct resource *res __maybe_unused) { return 0; } -static inline int acpi_check_region(resource_size_t start, resource_size_t n, - const char *name) +static inline int acpi_check_region(resource_size_t start __maybe_unused, + resource_size_t n __maybe_unused, + const char *name __maybe_unused) { return 0; } struct acpi_table_header; -static inline int acpi_table_parse(char *id, - int (*handler)(struct acpi_table_header *)) +static inline int acpi_table_parse(char *id __maybe_unused, + int (*handler)(struct acpi_table_header *) __maybe_unused) { return -1; } -static inline int acpi_nvs_register(__u64 start, __u64 size) +static inline int acpi_nvs_register(__u64 start __maybe_unused, + __u64 size __maybe_unused) { return 0; } -static inline int acpi_nvs_for_each_region(int (*func)(__u64, __u64, void *), - void *data) +static inline int acpi_nvs_for_each_region( + int (*func)(__u64, __u64, void *) __maybe_unused, + void *data __maybe_unused) { return 0; } @@ -461,13 +465,14 @@ struct acpi_device_id; static inline const struct acpi_device_id *acpi_match_device( - const struct acpi_device_id *ids, const struct device *dev) + const struct acpi_device_id *ids __maybe_unused, + const struct device *dev __maybe_unused) { return NULL; } -static inline bool acpi_driver_match_device(struct device *dev, - const struct device_driver *drv) +static inline bool acpi_driver_match_device(struct device *dev __maybe_unused, + const struct device_driver *drv __maybe_unused) { return false; } @@ -500,10 +505,22 @@ int acpi_subsys_runtime_suspend(struct device *dev); int acpi_subsys_runtime_resume(struct device *dev); #else -static inline int acpi_dev_runtime_suspend(struct device *dev) { return 0; } -static inline int acpi_dev_runtime_resume(struct device *dev) { return 0; } -static inline int acpi_subsys_runtime_suspend(struct device *dev) { return 0; } -static inline int acpi_subsys_runtime_resume(struct device *dev) { return 0; } +static inline int acpi_dev_runtime_suspend(struct device *dev __maybe_unused) +{ + return 0; +} +static inline int acpi_dev_runtime_resume(struct device *dev __maybe_unused) +{ + return 0; +} +static inline int acpi_subsys_runtime_suspend(struct device *dev __maybe_unused) +{ + return 0; +} +static inline int acpi_subsys_runtime_resume(struct device *dev __maybe_unused) +{ + return 0; +} #endif #if defined(CONFIG_ACPI) && defined(CONFIG_PM_SLEEP) @@ -513,11 +530,26 @@ int acpi_subsys_suspend_late(struct device *dev); int acpi_subsys_resume_early(struct device *dev); #else -static inline int acpi_dev_suspend_late(struct device *dev) { return 0; } -static inline int acpi_dev_resume_early(struct device *dev) { return 0; } -static inline int acpi_subsys_prepare(struct device *dev) { return 0; } -static inline int acpi_subsys_suspend_late(struct device *dev) { return 0; } -static inline int acpi_subsys_resume_early(struct device *dev) { return 0; } +static inline int acpi_dev_suspend_late(struct device *dev __maybe_unused) +{ + return 0; +} +static inline int acpi_dev_resume_early(struct device *dev __maybe_unused) +{ + return 0; +} +static inline int acpi_subsys_prepare(struct device *dev __maybe_unused) +{ + return 0; +} +static inline int acpi_subsys_suspend_late(struct device *dev __maybe_unused) +{ + return 0; +} +static inline int acpi_subsys_resume_early(struct device *dev __maybe_unused) +{ + return 0; +} #endif #if defined(CONFIG_ACPI) && defined(CONFIG_PM) @@ -525,15 +557,18 @@ int acpi_dev_pm_attach(struct device *dev, bool power_on); void acpi_dev_pm_detach(struct device *dev, bool power_off); #else -static inline struct acpi_device *acpi_dev_pm_get_node(struct device *dev) +static inline struct acpi_device *acpi_dev_pm_get_node( + struct device *dev __maybe_unused) { return NULL; } -static inline int acpi_dev_pm_attach(struct device *dev, bool power_on) +static inline int acpi_dev_pm_attach(struct device *dev __maybe_unused, + bool power_on __maybe_unused) { return -ENODEV; } -static inline void acpi_dev_pm_detach(struct device *dev, bool power_off) {} +static inline void acpi_dev_pm_detach(struct device *dev __maybe_unused, + bool power_off __maybe_unused) {} #endif #ifdef CONFIG_ACPI @@ -542,7 +577,9 @@ const char *fmt, ...); #else /* !CONFIG_ACPI */ static inline __printf(3, 4) void -acpi_handle_printk(const char *level, void *handle, const char *fmt, ...) {} +acpi_handle_printk(const char *level __maybe_unused, + void *handle __maybe_unused, + const char *fmt __maybe_unused, ...) {} #endif /* !CONFIG_ACPI */ /*