Unverified Commit 540c8302 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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: 0b4f8a68 ("firmware: imx: Add i.MX95 MISC driver")
Link: https://lore.kernel.org/r/20240909203023.1275232-1-arnd@kernel.org


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent fc282a66

include/linux/firmware/imx/sm.h

+0 −11
Original line number Diff line number Diff line
@@ -17,18 +17,7 @@ 
#define SCMI_IMX_CTRL_SAI4_MCLK		4	/* WAKE SAI4 MCLK */

#define SCMI_IMX_CTRL_SAI5_MCLK		5	/* WAKE SAI5 MCLK */



#if IS_ENABLED(CONFIG_IMX_SCMI_MISC_EXT)

int scmi_imx_misc_ctrl_get(u32 id, u32 *num, u32 *val);

int scmi_imx_misc_ctrl_set(u32 id, u32 val);

#else

static inline int scmi_imx_misc_ctrl_get(u32 id, u32 *num, u32 *val)

{

	return -EOPNOTSUPP;

}



static inline int scmi_imx_misc_ctrl_set(u32 id, u32 val);

{

	return -EOPNOTSUPP;

}

#endif

#endif