History

Merge branch 'fixes' into for-next

Resolve conflicts in dell/alienware-wmi-wmax and asus-wmi, and enable applying a few amd/hsmp patches that depend on changes in the fixes branch.

Ilpo Järvinen committed 1 year ago

Commit 593ee932 parents f94ffc3 bfcfe6d25 files · +366 −113Browse files

Showing the changes to include/linux/platform_data (1 of 25 files). Show all

Unified · Split

include/linux/platform_data/x86/intel_pmc_ipc.h+4−0
@@ -36,6 +36,7 @@ struct pmc_ipc_rbuf { · 35 unmodified lines
36 */36 */
37static inline int intel_pmc_ipc(struct pmc_ipc_cmd *ipc_cmd, struct pmc_ipc_rbuf *rbuf)37static inline int intel_pmc_ipc(struct pmc_ipc_cmd *ipc_cmd, struct pmc_ipc_rbuf *rbuf)
38{38{
39#ifdef CONFIG_ACPI
39 struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };40 struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
40 union acpi_object params[PMC_IPCS_PARAM_COUNT] = {41 union acpi_object params[PMC_IPCS_PARAM_COUNT] = {
41 {.type = ACPI_TYPE_INTEGER,},42 {.type = ACPI_TYPE_INTEGER,},
@@ -89,6 +90,9 @@ static inline int intel_pmc_ipc(struct pmc_ipc_cmd *ipc_cmd, struct pmc_ipc_rbuf · 47 unmodified lines
89 }90 }
90 91
91 return 0;92 return 0;
93#else
94 return -ENODEV;
95#endif /* CONFIG_ACPI */
92}96}
93 97
94#endif /* INTEL_PMC_IPC_H */98#endif /* INTEL_PMC_IPC_H */