diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2021-04-13 11:59:45 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2021-04-13 11:59:45 +0300 |
| commit | 5418db1f6ee3d876945f280d19a23fa3bcb8d8c5 (patch) | |
| tree | a7e897e39618706be2e27fd12cce3a3d3b8beb69 /include/linux | |
| parent | 30be8446db39be8dc52fc8cd2cb601d3d6319e9d (diff) | |
| parent | 79bfe480a0a0b259ab9fddcd2fe52c03542b1196 (diff) | |
| download | linux-5418db1f6ee3d876945f280d19a23fa3bcb8d8c5.tar.xz | |
Merge tag 'zynqmp-soc-for-v5.13' of https://github.com/Xilinx/linux-xlnx into arm/drivers
arm64: soc: ZynqMP SoC changes for v5.13
- Fix firmware removal path
- Cleanup eemi doc and *ops()
* tag 'zynqmp-soc-for-v5.13' of https://github.com/Xilinx/linux-xlnx:
firmware: xilinx: Remove zynqmp_pm_get_eemi_ops() in IS_REACHABLE(CONFIG_ZYNQMP_FIRMWARE)
firmware: xilinx: Fix dereferencing freed memory
Link: https://lore.kernel.org/r/a44f8e9f-cea7-57ef-c3bc-10f5f5e064fc@monstr.eu
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/firmware/xlnx-zynqmp.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/include/linux/firmware/xlnx-zynqmp.h b/include/linux/firmware/xlnx-zynqmp.h index 71177b17eee5..66e2423d9feb 100644 --- a/include/linux/firmware/xlnx-zynqmp.h +++ b/include/linux/firmware/xlnx-zynqmp.h @@ -354,11 +354,6 @@ int zynqmp_pm_read_pggs(u32 index, u32 *value); int zynqmp_pm_system_shutdown(const u32 type, const u32 subtype); int zynqmp_pm_set_boot_health_status(u32 value); #else -static inline struct zynqmp_eemi_ops *zynqmp_pm_get_eemi_ops(void) -{ - return ERR_PTR(-ENODEV); -} - static inline int zynqmp_pm_get_api_version(u32 *version) { return -ENODEV; |