haptics: drop the stale __assign_str argument in the tracepoint header - #3140
Merged
Conversation
__assign_str() lost its second parameter in 6.10; the string is taken from the matching __string() entry instead. Both vendored haptics patches still pass two, so the tracepoint header does not compile: include/trace/events/qcom_haptics.h:94:1: error: macro '__assign_str' passed 2 arguments, but takes just 1 This is invisible in the shipping config. CONFIG_FTRACE is off, so the TP_fast_assign body is never really compiled and the stale call is never checked. It breaks the build immediately for anyone who turns tracepoints on, which is how it surfaced: enabling them on SM8550 to investigate the UFS clock-gating behaviour in ROCKNIX#3126. SM8550 and SM8750 carry the same header and both need it. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
xiaodoudou
force-pushed
the
haptics-trace-assign-str
branch
from
August 7, 2026 13:03
f999cf1 to
d8a3b36
Compare
loki666
approved these changes
Aug 7, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
__assign_str()lost its second parameter in 6.10; it now takes the string from the matching__string()entry, which sits right above it. Both vendored haptics patches still pass two arguments ininclude/trace/events/qcom_haptics.h, so the header does not compile once tracepoints are enabled:This is invisible in the shipping config:
CONFIG_FTRACEis off, so theTP_fast_assignbody is never really compiled and the stale call is never checked. The fix is one line each in the SM8550 and SM8750 patches, which ship the same header.Testing
Built the SM8550 aarch64 image with
CONFIG_FTRACE=yandCONFIG_ENABLE_DEFAULT_TRACERS=y. SM8750 was not built; the change there is textually identical and the header is the same file.Without this change the build fails at
drivers/input/misc/qcom-hv-haptics.o. With it the kernel builds clean and exposes workingufs:tracepoints. Nothing exercised the haptics tracepoint at runtime, and withCONFIG_FTRACE=nthis is a no-op in the shipping config anyway.Additional Context
Spotted while working on the SM8550 deep suspend/resume PR (#3126): enabling tracepoints there to investigate UFS clock gating is what made the build fail. The fix itself is unrelated to that work, hence a separate PR.
AI Usage
While ROCKNIX doesn't have restrictions on AI tools in contributing, please be transparent about their usage as it
helps set the right context for reviewers.
Did you use AI tools to help write this code? YES
Yes. AI was used to find the bug and write the change.