diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2023-10-16 23:01:31 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2023-10-16 23:01:32 +0200 |
| commit | 15c46d85f0214b3705bc0a28ef8408a5de47f07f (patch) | |
| tree | 9302e62de948c55177159b23ee813e6f8092975b /include | |
| parent | Merge tag 'memory-controller-drv-6.7' of https://git.kernel.org/pub/scm/linux... (diff) | |
| parent | firmware: meson: Use device_get_match_data() (diff) | |
| download | linux-15c46d85f0214b3705bc0a28ef8408a5de47f07f.tar.xz linux-15c46d85f0214b3705bc0a28ef8408a5de47f07f.zip | |
Merge tag 'amlogic-drivers-for-v6.7' of https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux into soc/drivers
Amlogic drivers changes for v6.7:
- correct meson_sm_* API retval handling
- Use device_get_match_data() in meson SM
* tag 'amlogic-drivers-for-v6.7' of https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux:
firmware: meson: Use device_get_match_data()
drivers: meson: sm: correct meson_sm_* API retval handling
Link: https://lore.kernel.org/r/00ef6ab3-59c1-484a-9d70-50f16e4cc584@linaro.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/firmware/meson/meson_sm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/firmware/meson/meson_sm.h b/include/linux/firmware/meson/meson_sm.h index 95b0da2326a9..8eaf8922ab02 100644 --- a/include/linux/firmware/meson/meson_sm.h +++ b/include/linux/firmware/meson/meson_sm.h @@ -19,7 +19,7 @@ enum { struct meson_sm_firmware; int meson_sm_call(struct meson_sm_firmware *fw, unsigned int cmd_index, - u32 *ret, u32 arg0, u32 arg1, u32 arg2, u32 arg3, u32 arg4); + s32 *ret, u32 arg0, u32 arg1, u32 arg2, u32 arg3, u32 arg4); int meson_sm_call_write(struct meson_sm_firmware *fw, void *buffer, unsigned int b_size, unsigned int cmd_index, u32 arg0, u32 arg1, u32 arg2, u32 arg3, u32 arg4); |