]> www.infradead.org Git - users/willy/xarray.git/commit
firmware: imx: remove duplicate scmi_imx_misc_ctrl_get()
authorArnd Bergmann <arnd@arndb.de>
Mon, 9 Sep 2024 20:30:18 +0000 (20:30 +0000)
committerArnd Bergmann <arnd@arndb.de>
Wed, 11 Sep 2024 08:55:35 +0000 (08:55 +0000)
commit540c830212edc908361c39d40df21772a8bda308
treefedf3ffa1e8a67944edcdae814bf2eabe3f75d61
parentfc282a6643eef2136ad4d9797fd06be249cbdb91
firmware: imx: remove duplicate scmi_imx_misc_ctrl_get()

These two functions have a stub definition when CONFIG_IMX_SCMI_MISC_EXT
is not set, which conflict with the global definition:

In file included from drivers/firmware/imx/sm-misc.c:6:
include/linux/firmware/imx/sm.h:30:1: error: expected identifier or '(' before '{' token
   30 | {
      | ^
drivers/firmware/imx/sm-misc.c:26:5: error: redefinition of 'scmi_imx_misc_ctrl_get'
   26 | int scmi_imx_misc_ctrl_get(u32 id, u32 *num, u32 *val)
      |     ^~~~~~~~~~~~~~~~~~~~~~
include/linux/firmware/imx/sm.h:24:19: note: previous definition of 'scmi_imx_misc_ctrl_get' with type 'int(u32,  u32 *, u32 *)' {aka 'int(unsigned int,  unsigned int *, unsigned int *)'}
   24 | static inline int scmi_imx_misc_ctrl_get(u32 id, u32 *num, u32 *val)
      |                   ^~~~~~~~~~~~~~~~~~~~~~

There is no real need for the #ifdef, and removing this avoids
the build failure.

Fixes: 0b4f8a68b292 ("firmware: imx: Add i.MX95 MISC driver")
Link: https://lore.kernel.org/r/20240909203023.1275232-1-arnd@kernel.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
include/linux/firmware/imx/sm.h