Skip to content

Commit 15f75ec

Browse files
committed
shell: Remove shell workaround
Redefinition of SHELL_SUBCMD_ADD no longer needed in NCS 2.6.0. Signed-off-by: Audun Korneliussen <[email protected]>
1 parent 13daf73 commit 15f75ec

File tree

1 file changed

+0
-14
lines changed

1 file changed

+0
-14
lines changed

drivers/npmx/shell/shell_common.h

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,6 @@
1212
#include <npmx_charger.h>
1313
#include <zephyr/shell/shell.h>
1414

15-
/* Due to the bug in zephyr/shell/shell.h, it is required to override macro implementation. */
16-
/* It should be removed after the next Zephyr release with the fix. */
17-
/* https://github.com/zephyrproject-rtos/zephyr/pull/64455 */
18-
#undef SHELL_SUBCMD_ADD
19-
20-
// clang-format off
21-
#define SHELL_SUBCMD_ADD(_parent, _syntax, _subcmd, _help, _handler, _mand, _opt) \
22-
static const struct shell_static_entry Z_SHELL_SUBCMD_NAME(__DEBRACKET _parent, _syntax) \
23-
__attribute__((section("." STRINGIFY(Z_SHELL_SUBCMD_NAME( \
24-
NUM_VA_ARGS_LESS_1 _parent, __DEBRACKET _parent, _syntax))))) \
25-
__attribute__((used)) = \
26-
SHELL_EXPR_CMD_ARG(1, _syntax, _subcmd, _help, _handler, _mand, _opt)
27-
// clang-format on
28-
2915
/** @brief Max supported number of shell arguments. */
3016
#define SHELL_ARG_MAX_COUNT 3U
3117

0 commit comments

Comments
 (0)