2024-04-09 13:44:11

by Arnd Bergmann

Subject: [PATCH] accel/qaic: mark debugfs stub functions as static inline

From: Arnd Bergmann <[email protected]>

The alternative stub functions are listed as global, which produces
a build failure in some configs:

In file included from drivers/accel/qaic/qaic_drv.c:31:
drivers/accel/qaic/qaic_debugfs.h:16:5: error: no previous prototype for 'qaic_bootlog_register' [-Werror=missing-prototypes]
16 | int qaic_bootlog_register(void) { return 0; }
| ^~~~~~~~~~~~~~~~~~~~~
drivers/accel/qaic/qaic_debugfs.h:17:6: error: no previous prototype for 'qaic_bootlog_unregister' [-Werror=missing-prototypes]
17 | void qaic_bootlog_unregister(void) {}
| ^~~~~~~~~~~~~~~~~~~~~~~
drivers/accel/qaic/qaic_debugfs.h:18:6: error: no previous prototype for 'qaic_debugfs_init' [-Werror=missing-prototypes]
18 | void qaic_debugfs_init(struct qaic_drm_device *qddev) {}
| ^~~~~~~~~~~~~~~~~

Make them static inline as intended.

Fixes: 5f8df5c6def6 ("accel/qaic: Add bootlog debugfs")
Signed-off-by: Arnd Bergmann <[email protected]>
---
drivers/accel/qaic/qaic_debugfs.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/accel/qaic/qaic_debugfs.h b/drivers/accel/qaic/qaic_debugfs.h
index ea3fd1a88405..05e74f84cf9f 100644
--- a/drivers/accel/qaic/qaic_debugfs.h
+++ b/drivers/accel/qaic/qaic_debugfs.h
@@ -13,8 +13,8 @@ int qaic_bootlog_register(void);
void qaic_bootlog_unregister(void);
void qaic_debugfs_init(struct qaic_drm_device *qddev);
#else
-int qaic_bootlog_register(void) { return 0; }
-void qaic_bootlog_unregister(void) {}
-void qaic_debugfs_init(struct qaic_drm_device *qddev) {}
+static inline int qaic_bootlog_register(void) { return 0; }
+static inline void qaic_bootlog_unregister(void) {}
+static inline void qaic_debugfs_init(struct qaic_drm_device *qddev) {}
#endif /* CONFIG_DEBUG_FS */
#endif /* __QAIC_DEBUGFS_H__ */
--
2.39.2

2024-04-12 15:58:09

by Jeffrey Hugo

Subject: Re: [PATCH] accel/qaic: mark debugfs stub functions as static inline

On 4/9/2024 7:39 AM, Arnd Bergmann wrote:
> From: Arnd Bergmann <[email protected]>
>
> The alternative stub functions are listed as global, which produces
> a build failure in some configs:
>
> In file included from drivers/accel/qaic/qaic_drv.c:31:
> drivers/accel/qaic/qaic_debugfs.h:16:5: error: no previous prototype for 'qaic_bootlog_register' [-Werror=missing-prototypes]
> 16 | int qaic_bootlog_register(void) { return 0; }
> | ^~~~~~~~~~~~~~~~~~~~~
> drivers/accel/qaic/qaic_debugfs.h:17:6: error: no previous prototype for 'qaic_bootlog_unregister' [-Werror=missing-prototypes]
> 17 | void qaic_bootlog_unregister(void) {}
> | ^~~~~~~~~~~~~~~~~~~~~~~
> drivers/accel/qaic/qaic_debugfs.h:18:6: error: no previous prototype for 'qaic_debugfs_init' [-Werror=missing-prototypes]
> 18 | void qaic_debugfs_init(struct qaic_drm_device *qddev) {}
> | ^~~~~~~~~~~~~~~~~
>
> Make them static inline as intended.
>
> Fixes: 5f8df5c6def6 ("accel/qaic: Add bootlog debugfs")
> Signed-off-by: Arnd Bergmann <[email protected]>

Pushed to drm-misc-next

-Jeff

2024-04-12 16:01:01

by Jeffrey Hugo

Subject: Re: [PATCH] accel/qaic: mark debugfs stub functions as static inline

On 4/9/2024 7:39 AM, Arnd Bergmann wrote:
> From: Arnd Bergmann <[email protected]>
>
> The alternative stub functions are listed as global, which produces
> a build failure in some configs:
>
> In file included from drivers/accel/qaic/qaic_drv.c:31:
> drivers/accel/qaic/qaic_debugfs.h:16:5: error: no previous prototype for 'qaic_bootlog_register' [-Werror=missing-prototypes]
> 16 | int qaic_bootlog_register(void) { return 0; }
> | ^~~~~~~~~~~~~~~~~~~~~
> drivers/accel/qaic/qaic_debugfs.h:17:6: error: no previous prototype for 'qaic_bootlog_unregister' [-Werror=missing-prototypes]
> 17 | void qaic_bootlog_unregister(void) {}
> | ^~~~~~~~~~~~~~~~~~~~~~~
> drivers/accel/qaic/qaic_debugfs.h:18:6: error: no previous prototype for 'qaic_debugfs_init' [-Werror=missing-prototypes]
> 18 | void qaic_debugfs_init(struct qaic_drm_device *qddev) {}
> | ^~~~~~~~~~~~~~~~~
>
> Make them static inline as intended.
>
> Fixes: 5f8df5c6def6 ("accel/qaic: Add bootlog debugfs")
> Signed-off-by: Arnd Bergmann <[email protected]>

Doh. Thank you for addressing this so quickly.

Reviewed-by: Jeffrey Hugo <[email protected]>