Skip to content

Commit 23c39cb

Browse files
arndbHans Verkuil
authored andcommitted
media: qcom: camss: avoid format string warning
clang-22 warns about csiphy_match_clock_name() taking a variable format string that is not checked against the 'int index' argument: drivers/media/platform/qcom/camss/camss-csiphy.c:566:44: error: diagnostic behavior may be improved by adding the 'format(printf, 2, 3)' attribute to the declaration of 'csiphy_match_clock_name' [-Werror,-Wmissing-format-attribute] 561 | static bool csiphy_match_clock_name(const char *clock_name, const char *format, | __attribute__((format(printf, 2, 3))) 562 | int index) 563 | { 564 | char name[16]; /* csiphyXXX_timer\0 */ 565 | 566 | snprintf(name, sizeof(name), format, index); | ^ drivers/media/platform/qcom/camss/camss-csiphy.c:561:13: note: 'csiphy_match_clock_name' declared here 561 | static bool csiphy_match_clock_name(const char *clock_name, const char *format, | ^ Change the function to use a snprintf() style format string that allows this to be checked at the call site. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Reviewed-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> Signed-off-by: Bryan O'Donoghue <bod@kernel.org> Signed-off-by: Hans Verkuil <hverkuil+cisco@kernel.org>
1 parent d31fac4 commit 23c39cb

1 file changed

Lines changed: 7 additions & 3 deletions

File tree

drivers/media/platform/qcom/camss/camss-csiphy.c

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -558,12 +558,16 @@ static int csiphy_init_formats(struct v4l2_subdev *sd,
558558
return csiphy_set_format(sd, fh ? fh->state : NULL, &format);
559559
}
560560

561-
static bool csiphy_match_clock_name(const char *clock_name, const char *format,
562-
int index)
561+
static bool __printf(2, 3)
562+
csiphy_match_clock_name(const char *clock_name, const char *format, ...)
563563
{
564564
char name[16]; /* csiphyXXX_timer\0 */
565+
va_list args;
566+
567+
va_start(args, format);
568+
vsnprintf(name, sizeof(name), format, args);
569+
va_end(args);
565570

566-
snprintf(name, sizeof(name), format, index);
567571
return !strcmp(clock_name, name);
568572
}
569573

0 commit comments

Comments
 (0)