Message ID | 20231114-rtas-trivial-v2-5-59cbab208d57@linux.ibm.com (mailing list archive) |
---|---|
State | Superseded |
Headers | show |
Series | powerpc/rtas: Trivial and coding style fixes | expand |
Context | Check | Description |
---|---|---|
snowpatch_ozlabs/github-powerpc_sparse | success | Successfully ran 4 jobs. |
snowpatch_ozlabs/github-powerpc_clang | fail | 2 of 6 jobs failed. |
snowpatch_ozlabs/github-powerpc_ppctests | fail | ppctests (ubuntu-20.04, ppc64le) failed 0 of 0 steps. |
snowpatch_ozlabs/github-powerpc_selftests | fail | selftests (ubuntu-18.04, ppc64) failed 0 of 0 steps. |
snowpatch_ozlabs/github-powerpc_kernel_qemu | success | Successfully ran 23 jobs. |
On Tue, 2023-11-14 at 11:22 -0600, Nathan Lynch via B4 Relay wrote: > From: Nathan Lynch <nathanl@linux.ibm.com> > > This header occasionally gains new function declarations without the > leading extern in accordance with current style rules. Leaving the > legacy externs in place is making the header more difficult to read > over time because of the inconsistency. Remove them, fixing up > checkpatch issues with unnamed parameters (rtas_call) and bracket > alignment (early_init_dt_scan_rtas) that get raised as a result of > touching the code. > > Signed-off-by: Nathan Lynch <nathanl@linux.ibm.com>' LGTM Reviewed-by: Andrew Donnellan <ajd@linux.ibm.com> > --- > arch/powerpc/include/asm/rtas.h | 53 ++++++++++++++++++++----------- > ---------- > 1 file changed, 26 insertions(+), 27 deletions(-) > > diff --git a/arch/powerpc/include/asm/rtas.h > b/arch/powerpc/include/asm/rtas.h > index 1bed6be8ada3..a7110ed52e25 100644 > --- a/arch/powerpc/include/asm/rtas.h > +++ b/arch/powerpc/include/asm/rtas.h > @@ -408,42 +408,41 @@ static inline bool > rtas_function_implemented(const rtas_fn_handle_t handle) > { > return rtas_function_token(handle) != RTAS_UNKNOWN_SERVICE; > } > -extern int rtas_token(const char *service); > -extern int rtas_call(int token, int, int, int *, ...); > +int rtas_token(const char *service); > +int rtas_call(int token, int nargs, int nret, int *outputs, ...); > void rtas_call_unlocked(struct rtas_args *args, int token, int > nargs, > int nret, ...); > -extern void __noreturn rtas_restart(char *cmd); > -extern void rtas_power_off(void); > -extern void __noreturn rtas_halt(void); > -extern void rtas_os_term(char *str); > +void __noreturn rtas_restart(char *cmd); > +void rtas_power_off(void); > +void __noreturn rtas_halt(void); > +void rtas_os_term(char *str); > void rtas_activate_firmware(void); > -extern int rtas_get_sensor(int sensor, int index, int *state); > -extern int rtas_get_sensor_fast(int sensor, int index, int *state); > -extern int rtas_get_power_level(int powerdomain, int *level); > -extern int rtas_set_power_level(int powerdomain, int level, int > *setlevel); > -extern bool rtas_indicator_present(int token, int *maxindex); > -extern int rtas_set_indicator(int indicator, int index, int > new_value); > -extern int rtas_set_indicator_fast(int indicator, int index, int > new_value); > -extern void rtas_progress(char *s, unsigned short hex); > +int rtas_get_sensor(int sensor, int index, int *state); > +int rtas_get_sensor_fast(int sensor, int index, int *state); > +int rtas_get_power_level(int powerdomain, int *level); > +int rtas_set_power_level(int powerdomain, int level, int *setlevel); > +bool rtas_indicator_present(int token, int *maxindex); > +int rtas_set_indicator(int indicator, int index, int new_value); > +int rtas_set_indicator_fast(int indicator, int index, int > new_value); > +void rtas_progress(char *s, unsigned short hex); > int rtas_ibm_suspend_me(int *fw_status); > int rtas_error_rc(int rtas_rc); > > struct rtc_time; > -extern time64_t rtas_get_boot_time(void); > -extern void rtas_get_rtc_time(struct rtc_time *rtc_time); > -extern int rtas_set_rtc_time(struct rtc_time *rtc_time); > +time64_t rtas_get_boot_time(void); > +void rtas_get_rtc_time(struct rtc_time *rtc_time); > +int rtas_set_rtc_time(struct rtc_time *rtc_time); > > -extern unsigned int rtas_busy_delay_time(int status); > +unsigned int rtas_busy_delay_time(int status); > bool rtas_busy_delay(int status); > > -extern int early_init_dt_scan_rtas(unsigned long node, > - const char *uname, int depth, void *data); > +int early_init_dt_scan_rtas(unsigned long node, const char *uname, > int depth, void *data); > > -extern void pSeries_log_error(char *buf, unsigned int err_type, int > fatal); > +void pSeries_log_error(char *buf, unsigned int err_type, int fatal); > > #ifdef CONFIG_PPC_PSERIES > extern time64_t last_rtas_event; > -extern int clobbering_unread_rtas_event(void); > +int clobbering_unread_rtas_event(void); > int rtas_syscall_dispatch_ibm_suspend_me(u64 handle); > #else > static inline int clobbering_unread_rtas_event(void) { return 0; } > @@ -454,7 +453,7 @@ static inline int > rtas_syscall_dispatch_ibm_suspend_me(u64 handle) > #endif > > #ifdef CONFIG_PPC_RTAS_DAEMON > -extern void rtas_cancel_event_scan(void); > +void rtas_cancel_event_scan(void); > #else > static inline void rtas_cancel_event_scan(void) { } > #endif > @@ -479,7 +478,7 @@ static inline void rtas_cancel_event_scan(void) { > } > * for all rtas calls that require an error buffer argument. > * This includes 'check-exception' and 'rtas-last-error'. > */ > -extern int rtas_get_error_log_max(void); > +int rtas_get_error_log_max(void); > > /* Event Scan Parameters */ > #define EVENT_SCAN_ALL_EVENTS 0xf0000000 > @@ -518,8 +517,8 @@ static inline u32 rtas_config_addr(int busno, int > devfn, int reg) > (devfn << 8) | (reg & 0xff); > } > > -extern void rtas_give_timebase(void); > -extern void rtas_take_timebase(void); > +void rtas_give_timebase(void); > +void rtas_take_timebase(void); > > #ifdef CONFIG_PPC_RTAS > static inline int page_is_rtas_user_buf(unsigned long pfn) > @@ -532,7 +531,7 @@ static inline int page_is_rtas_user_buf(unsigned > long pfn) > > /* Not the best place to put pSeries_coalesce_init, will be fixed > when we > * move some of the rtas suspend-me stuff to pseries */ > -extern void pSeries_coalesce_init(void); > +void pSeries_coalesce_init(void); > void rtas_initialize(void); > #else > static inline int page_is_rtas_user_buf(unsigned long pfn) { return > 0;} >
diff --git a/arch/powerpc/include/asm/rtas.h b/arch/powerpc/include/asm/rtas.h index 1bed6be8ada3..a7110ed52e25 100644 --- a/arch/powerpc/include/asm/rtas.h +++ b/arch/powerpc/include/asm/rtas.h @@ -408,42 +408,41 @@ static inline bool rtas_function_implemented(const rtas_fn_handle_t handle) { return rtas_function_token(handle) != RTAS_UNKNOWN_SERVICE; } -extern int rtas_token(const char *service); -extern int rtas_call(int token, int, int, int *, ...); +int rtas_token(const char *service); +int rtas_call(int token, int nargs, int nret, int *outputs, ...); void rtas_call_unlocked(struct rtas_args *args, int token, int nargs, int nret, ...); -extern void __noreturn rtas_restart(char *cmd); -extern void rtas_power_off(void); -extern void __noreturn rtas_halt(void); -extern void rtas_os_term(char *str); +void __noreturn rtas_restart(char *cmd); +void rtas_power_off(void); +void __noreturn rtas_halt(void); +void rtas_os_term(char *str); void rtas_activate_firmware(void); -extern int rtas_get_sensor(int sensor, int index, int *state); -extern int rtas_get_sensor_fast(int sensor, int index, int *state); -extern int rtas_get_power_level(int powerdomain, int *level); -extern int rtas_set_power_level(int powerdomain, int level, int *setlevel); -extern bool rtas_indicator_present(int token, int *maxindex); -extern int rtas_set_indicator(int indicator, int index, int new_value); -extern int rtas_set_indicator_fast(int indicator, int index, int new_value); -extern void rtas_progress(char *s, unsigned short hex); +int rtas_get_sensor(int sensor, int index, int *state); +int rtas_get_sensor_fast(int sensor, int index, int *state); +int rtas_get_power_level(int powerdomain, int *level); +int rtas_set_power_level(int powerdomain, int level, int *setlevel); +bool rtas_indicator_present(int token, int *maxindex); +int rtas_set_indicator(int indicator, int index, int new_value); +int rtas_set_indicator_fast(int indicator, int index, int new_value); +void rtas_progress(char *s, unsigned short hex); int rtas_ibm_suspend_me(int *fw_status); int rtas_error_rc(int rtas_rc); struct rtc_time; -extern time64_t rtas_get_boot_time(void); -extern void rtas_get_rtc_time(struct rtc_time *rtc_time); -extern int rtas_set_rtc_time(struct rtc_time *rtc_time); +time64_t rtas_get_boot_time(void); +void rtas_get_rtc_time(struct rtc_time *rtc_time); +int rtas_set_rtc_time(struct rtc_time *rtc_time); -extern unsigned int rtas_busy_delay_time(int status); +unsigned int rtas_busy_delay_time(int status); bool rtas_busy_delay(int status); -extern int early_init_dt_scan_rtas(unsigned long node, - const char *uname, int depth, void *data); +int early_init_dt_scan_rtas(unsigned long node, const char *uname, int depth, void *data); -extern void pSeries_log_error(char *buf, unsigned int err_type, int fatal); +void pSeries_log_error(char *buf, unsigned int err_type, int fatal); #ifdef CONFIG_PPC_PSERIES extern time64_t last_rtas_event; -extern int clobbering_unread_rtas_event(void); +int clobbering_unread_rtas_event(void); int rtas_syscall_dispatch_ibm_suspend_me(u64 handle); #else static inline int clobbering_unread_rtas_event(void) { return 0; } @@ -454,7 +453,7 @@ static inline int rtas_syscall_dispatch_ibm_suspend_me(u64 handle) #endif #ifdef CONFIG_PPC_RTAS_DAEMON -extern void rtas_cancel_event_scan(void); +void rtas_cancel_event_scan(void); #else static inline void rtas_cancel_event_scan(void) { } #endif @@ -479,7 +478,7 @@ static inline void rtas_cancel_event_scan(void) { } * for all rtas calls that require an error buffer argument. * This includes 'check-exception' and 'rtas-last-error'. */ -extern int rtas_get_error_log_max(void); +int rtas_get_error_log_max(void); /* Event Scan Parameters */ #define EVENT_SCAN_ALL_EVENTS 0xf0000000 @@ -518,8 +517,8 @@ static inline u32 rtas_config_addr(int busno, int devfn, int reg) (devfn << 8) | (reg & 0xff); } -extern void rtas_give_timebase(void); -extern void rtas_take_timebase(void); +void rtas_give_timebase(void); +void rtas_take_timebase(void); #ifdef CONFIG_PPC_RTAS static inline int page_is_rtas_user_buf(unsigned long pfn) @@ -532,7 +531,7 @@ static inline int page_is_rtas_user_buf(unsigned long pfn) /* Not the best place to put pSeries_coalesce_init, will be fixed when we * move some of the rtas suspend-me stuff to pseries */ -extern void pSeries_coalesce_init(void); +void pSeries_coalesce_init(void); void rtas_initialize(void); #else static inline int page_is_rtas_user_buf(unsigned long pfn) { return 0;}