Skip to contentSkip to conversation

tracing: Remove duplicate `type` field from regmap `regcache_sync` trace event

RFC PATCH In review Philippe Duplessis-Guindon 3 participants 4 messages Nov 24, 2020

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

RFC PATCH v2 1/1 tracing: Remove duplicate `type` field from regmap `regcache_sync` trace event

I have an error saying that regcache_sync has 2 fields named type while using libtraceevent.

Erase the int field type, which is not assigned. This field is introduced by mistake and this commit removes it.

Fixes commit 593600890110c ("regmap: Add the regcache_sync trace event")

---
 drivers/base/regmap/trace.h | 1 -
 1 file changed, 1 deletion(-)
drivers/base/regmap/trace.h +0 -1
index d4066fa079ab..9abee14df9ee 100644
@@ -126,7 +126,6 @@ TRACE_EVENT(regcache_sync,
 		__string(       name,           regmap_name(map)	)
 		__string(	status,		status			)
 		__string(	type,		type			)
-		__field(	int,		type			)
 	),
 
 	TP_fast_assign(
Signature · 1 line
2.25.1
maintainer
#1 lore raw
Quoted 3 lines · Philippe Duplessis-Guindon

Fixes commit 593600890110c ("regmap: Add the regcache_sync trace event")

Please follow the format for Fixes: tags documented in submitting-patches.rst and existing usage in the kernel.

Please submit patches using subject lines reflecting the style for the subsystem, this makes it easier for people to identify relevant patches. Look at what existing commits in the area you're changing are doing and make sure your subject lines visually resemble what they're doing. There's no need to resubmit to fix this alone.

maintainer
#2 lore raw
In reply to Philippe Duplessis-Guindon
Quoted 7 lines · Philippe Duplessis-Guindon

I have an error saying that regcache_sync has 2 fields named type while using libtraceevent.

Erase the int field type, which is not assigned. This field is introduced by mistake and this commit removes it.

Fixes commit 593600890110c ("regmap: Add the regcache_sync trace event")

Applied to

https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git for-next

Thanks!

[1/1] regmap: Remove duplicate type field from regmap regcache_sync trace event

      commit: e6e9354b58307c120afbdc2719a6093638c37446

All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying to this mail.

Thanks,
Mark

Reviewed-by on v2 1/1
#3 lore raw
In reply to Philippe Duplessis-Guindon
Quoted 9 lines · On Tue, 24 Nov 2020 08:57:30 -0500 Philippe Duplessis-Guindon…

I have an error saying that regcache_sync has 2 fields named type while using libtraceevent.

Erase the int field type, which is not assigned. This field is introduced by mistake and this commit removes it.

Fixes commit 593600890110c ("regmap: Add the regcache_sync trace event")

-- Steve

Quoted 16 lines
---
 drivers/base/regmap/trace.h | 1 -
 1 file changed, 1 deletion(-)
drivers/base/regmap/trace.h +0 -1
index d4066fa079ab..9abee14df9ee 100644
@@ -126,7 +126,6 @@ TRACE_EVENT(regcache_sync,
 		__string(       name,           regmap_name(map)	)
 		__string(	status,		status			)
 		__string(	type,		type			)
-		__field(	int,		type			)
 	),
 
 	TP_fast_assign(