diff options
author | Olof Johansson <olof@lixom.net> | 2019-01-04 14:30:36 -0800 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2019-01-04 14:31:38 -0800 |
commit | 00f8ccd0c95f4e604297057a5bccec86c0903d14 (patch) | |
tree | 3ef930b38f7341be627da106f6ec31a007c207e4 /include/soc/qcom/cmd-db.h | |
parent | ARM: multi_v7_defconfig: enable CONFIG_UNIPHIER_MDMAC (diff) | |
parent | Merge tag 'qcom-drivers-for-4.21-2' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux into next/drivers (diff) | |
download | linux-dev-00f8ccd0c95f4e604297057a5bccec86c0903d14.tar.xz linux-dev-00f8ccd0c95f4e604297057a5bccec86c0903d14.zip |
Merge branch 'next/drivers' into next/late
Merge in a few missing patches from the pull request (my copy of the
branch was behind the staged version in linux-next).
* next/drivers:
memory: pl353: Add driver for arm pl353 static memory controller
dt-bindings: memory: Add pl353 smc controller devicetree binding information
firmware: qcom: scm: fix compilation error when disabled
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'include/soc/qcom/cmd-db.h')
-rw-r--r-- | include/soc/qcom/cmd-db.h | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/include/soc/qcom/cmd-db.h b/include/soc/qcom/cmd-db.h index 578180cbc134..af9722223925 100644 --- a/include/soc/qcom/cmd-db.h +++ b/include/soc/qcom/cmd-db.h @@ -18,9 +18,7 @@ enum cmd_db_hw_type { #if IS_ENABLED(CONFIG_QCOM_COMMAND_DB) u32 cmd_db_read_addr(const char *resource_id); -int cmd_db_read_aux_data(const char *resource_id, u8 *data, size_t len); - -size_t cmd_db_read_aux_data_len(const char *resource_id); +const void *cmd_db_read_aux_data(const char *resource_id, size_t *len); enum cmd_db_hw_type cmd_db_read_slave_id(const char *resource_id); @@ -29,12 +27,8 @@ int cmd_db_ready(void); static inline u32 cmd_db_read_addr(const char *resource_id) { return 0; } -static inline int cmd_db_read_aux_data(const char *resource_id, u8 *data, - size_t len) -{ return -ENODEV; } - -static inline size_t cmd_db_read_aux_data_len(const char *resource_id) -{ return -ENODEV; } +static inline const void *cmd_db_read_aux_data(const char *resource_id, size_t *len) +{ return ERR_PTR(-ENODEV); } static inline enum cmd_db_hw_type cmd_db_read_slave_id(const char *resource_id) { return -ENODEV; } |