| Message ID | 20240627124419.2498642-1-bero@baylibre.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | staging: vchiq_debugfs: Fix build if CONFIG_DEBUG_FS is not set | expand |
Am 27.06.24 um 14:44 schrieb Bernhard Rosenkränzer: > Commit 42a2f6664e18 ("staging: vc04_services: Move global g_state to > vchiq_state") adds a parameter to vchiq_debugfs_init, but leaves the > dummy implementation in the !CONFIG_DEBUG_FS case untouched, causing a > compile time error. > > Fixes: c3552ab19aeb ("staging: vchiq_debugfs: Fix NPD in vchiq_dump_state") > Signed-off-by: Bernhard Rosenkränzer <bero@baylibre.com> Oh dear, thanks for fixing Reviewed-by: Stefan Wahren <wahrenst@gmx.net>
Hi Bernhard, Am Donnerstag, 27. Juni 2024, 14:44:19 MESZ schrieb Bernhard Rosenkränzer: > Commit 42a2f6664e18 ("staging: vc04_services: Move global g_state to > vchiq_state") adds a parameter to vchiq_debugfs_init, but leaves the > dummy implementation in the !CONFIG_DEBUG_FS case untouched, causing a > compile time error. > > Fixes: c3552ab19aeb ("staging: vchiq_debugfs: Fix NPD in vchiq_dump_state") > Signed-off-by: Bernhard Rosenkränzer <bero@baylibre.com> > --- > .../staging/vc04_services/interface/vchiq_arm/vchiq_debugfs.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_debugfs.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_debugfs.c > index 1f74d0bb33bae..d5f7f61c56269 100644 > --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_debugfs.c > +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_debugfs.c > @@ -138,7 +138,7 @@ void vchiq_debugfs_deinit(void) > > #else /* CONFIG_DEBUG_FS */ > > -void vchiq_debugfs_init(void) > +void vchiq_debugfs_init(struct vchiq_state *state) > { > } > How about encapsulating the code inside if (IS_ENABLED(CONFIG_DEBUG_FS)) and remove the #ifdef CONFIG_DEBUG_FS alltogether? AFAIK this will do a compile test even if CONFIG_DEBUG_FS is unset. Best regards, Alexander
diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_debugfs.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_debugfs.c index 1f74d0bb33bae..d5f7f61c56269 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_debugfs.c +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_debugfs.c @@ -138,7 +138,7 @@ void vchiq_debugfs_deinit(void) #else /* CONFIG_DEBUG_FS */ -void vchiq_debugfs_init(void) +void vchiq_debugfs_init(struct vchiq_state *state) { }
Commit 42a2f6664e18 ("staging: vc04_services: Move global g_state to vchiq_state") adds a parameter to vchiq_debugfs_init, but leaves the dummy implementation in the !CONFIG_DEBUG_FS case untouched, causing a compile time error. Fixes: c3552ab19aeb ("staging: vchiq_debugfs: Fix NPD in vchiq_dump_state") Signed-off-by: Bernhard Rosenkränzer <bero@baylibre.com> --- .../staging/vc04_services/interface/vchiq_arm/vchiq_debugfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)