drm/radeon: move prototypes to header
Subsystems (2)
PATCH 1/1 drm/radeon: move prototypes to header
From: Arnd Bergmann <[email protected]>
Global functions in radeon_atpx_handler.c are not declared in a header but instead in each file using them. This risks the types getting out of sync and causes warnings:
drivers/gpu/drm/radeon/radeon_atpx_handler.c:64:6: error: no previous prototype for 'radeon_has_atpx' [-Werror=missing-prototypes] drivers/gpu/drm/radeon/radeon_atpx_handler.c:68:6: error: no previous prototype for 'radeon_has_atpx_dgpu_power_cntl' [-Werror=missing-prototypes] drivers/gpu/drm/radeon/radeon_atpx_handler.c:72:6: error: no previous prototype for 'radeon_is_atpx_hybrid' [-Werror=missing-prototypes] drivers/gpu/drm/radeon/radeon_atpx_handler.c:76:6: error: no previous prototype for 'radeon_atpx_dgpu_req_power_for_displays' [-Werror=missing-prototypes] drivers/gpu/drm/radeon/radeon_atpx_handler.c:594:6: error: no previous prototype for 'radeon_register_atpx_handler' [-Werror=missing-prototypes] drivers/gpu/drm/radeon/radeon_atpx_handler.c:612:6: error: no previous prototype for 'radeon_unregister_atpx_handler' [-Werror=missing-prototypes]
--- drivers/gpu/drm/radeon/radeon.h | 18 ++++++++++++++++++ drivers/gpu/drm/radeon/radeon_acpi.c | 6 ------ drivers/gpu/drm/radeon/radeon_atpx_handler.c | 1 + drivers/gpu/drm/radeon/radeon_device.c | 8 -------- drivers/gpu/drm/radeon/radeon_drv.c | 13 ------------- drivers/gpu/drm/radeon/radeon_kms.c | 6 ------ 6 files changed, 19 insertions(+), 33 deletions(-)
drivers/gpu/drm/radeon/radeon.h +18 -0
@@ -2964,6 +2964,24 @@ void radeon_irq_kms_set_irq_n_enabled(struct radeon_device *rdev,void radeon_audio_component_init (struct radeon_device *rdev);void radeon_audio_component_fini (struct radeon_device *rdev); +/* atpx handler */ +#if defined(CONFIG_VGA_SWITCHEROO ) +bool radeon_has_atpx (void ); +void radeon_register_atpx_handler (void ); +void radeon_unregister_atpx_handler (void ); +bool radeon_has_atpx_dgpu_power_cntl (void ); +bool radeon_is_atpx_hybrid (void ); +bool radeon_atpx_dgpu_req_power_for_displays (void ); +#else +static inline bool radeon_has_atpx (void ) {return false; } +static inline void radeon_register_atpx_handler (void ) {} +static inline void radeon_unregister_atpx_handler (void ) {} +static inline bool radeon_has_atpx_dgpu_power_cntl (void ) {return false; } +static inline bool radeon_is_atpx_hybrid (void ) {return false; } +static inline bool radeon_atpx_dgpu_req_power_for_displays (void ) {return false; } +#endif + +#include "radeon_object.h" #endif
drivers/gpu/drm/radeon/radeon_acpi.c +0 -6
@@ -38,12 +38,6 @@#include "radeon_acpi.h" #include "radeon_pm.h" -#if defined(CONFIG_VGA_SWITCHEROO ) -bool radeon_atpx_dgpu_req_power_for_displays (void ); -#else -static inline bool radeon_atpx_dgpu_req_power_for_displays (void ) {return false; } -#endif -#define ACPI_AC_CLASS "ac_adapter"struct atif_verify_interface {
drivers/gpu/drm/radeon/radeon_atpx_handler.c +1 -0
@@ -12,6 +12,7 @@#include <linux/delay.h> #include "radeon_acpi.h" +#include "radeon.h" struct radeon_atpx_functions {bool px_params;
drivers/gpu/drm/radeon/radeon_device.c +0 -8
@@ -113,14 +113,6 @@ static const char radeon_family_name[][16] = { "LAST", }; -#if defined(CONFIG_VGA_SWITCHEROO ) -bool radeon_has_atpx_dgpu_power_cntl (void ); -bool radeon_is_atpx_hybrid (void ); -#else -static inline bool radeon_has_atpx_dgpu_power_cntl (void ) {return false; } -static inline bool radeon_is_atpx_hybrid (void ) {return false; } -#endif -#define RADEON_PX_QUIRK_DISABLE_PX (1 << 0)struct radeon_px_quirk {
drivers/gpu/drm/radeon/radeon_drv.c +0 -13
@@ -128,19 +128,6 @@ int radeon_mode_dumb_create(struct drm_file *file_priv,struct drm_device *dev, struct drm_mode_create_dumb *args); -/* atpx handler */ -#if defined(CONFIG_VGA_SWITCHEROO ) -void radeon_register_atpx_handler (void ); -void radeon_unregister_atpx_handler (void ); -bool radeon_has_atpx_dgpu_power_cntl (void ); -bool radeon_is_atpx_hybrid (void ); -#else -static inline void radeon_register_atpx_handler (void ) {} -static inline void radeon_unregister_atpx_handler (void ) {} -static inline bool radeon_has_atpx_dgpu_power_cntl (void ) {return false; } -static inline bool radeon_is_atpx_hybrid (void ) {return false; } -#endif -int radeon_no_wb;int radeon_modeset =-1 ;int radeon_dynclks =-1 ;
drivers/gpu/drm/radeon/radeon_kms.c +0 -6
@@ -41,12 +41,6 @@#include "radeon_drv.h" #include "radeon_kms.h" -#if defined(CONFIG_VGA_SWITCHEROO ) -bool radeon_has_atpx (void ); -#else -static inline bool radeon_has_atpx (void ) {return false; } -#endif -/** * radeon_driver_unload_kms - Main unload function for KMS. *
Signature · 1 line
2.39.2