| Message ID | 20211126180101.27818-8-digetx@gmail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Introduce power-off+restart call chain API | expand |
On Fri, Nov 26, 2021 at 7:02 PM Dmitry Osipenko <digetx@gmail.com> wrote: > > There is no need to annotate function prototypes with 'extern', it makes > code less readable. Remove unnecessary annotations from <reboot.h>. > > Signed-off-by: Dmitry Osipenko <digetx@gmail.com> I'm not sure that this is really useful. Personally, I tend to respect the existing conventions like this. Surely, this change is not required for the rest of the series to work. > --- > include/linux/reboot.h | 38 +++++++++++++++++++------------------- > 1 file changed, 19 insertions(+), 19 deletions(-) > > diff --git a/include/linux/reboot.h b/include/linux/reboot.h > index 7c288013a3ca..b7fa25726323 100644 > --- a/include/linux/reboot.h > +++ b/include/linux/reboot.h > @@ -40,36 +40,36 @@ extern int reboot_cpu; > extern int reboot_force; > > > -extern int register_reboot_notifier(struct notifier_block *); > -extern int unregister_reboot_notifier(struct notifier_block *); > +int register_reboot_notifier(struct notifier_block *); > +int unregister_reboot_notifier(struct notifier_block *); > > -extern int devm_register_reboot_notifier(struct device *, struct notifier_block *); > +int devm_register_reboot_notifier(struct device *, struct notifier_block *); > > -extern int register_restart_handler(struct notifier_block *); > -extern int unregister_restart_handler(struct notifier_block *); > -extern void do_kernel_restart(char *cmd); > +int register_restart_handler(struct notifier_block *); > +int unregister_restart_handler(struct notifier_block *); > +void do_kernel_restart(char *cmd); > > /* > * Architecture-specific implementations of sys_reboot commands. > */ > > -extern void migrate_to_reboot_cpu(void); > -extern void machine_restart(char *cmd); > -extern void machine_halt(void); > -extern void machine_power_off(void); > +void migrate_to_reboot_cpu(void); > +void machine_restart(char *cmd); > +void machine_halt(void); > +void machine_power_off(void); > > -extern void machine_shutdown(void); > +void machine_shutdown(void); > struct pt_regs; > -extern void machine_crash_shutdown(struct pt_regs *); > +void machine_crash_shutdown(struct pt_regs *); > > /* > * Architecture independent implementations of sys_reboot commands. > */ > > -extern void kernel_restart_prepare(char *cmd); > -extern void kernel_restart(char *cmd); > -extern void kernel_halt(void); > -extern void kernel_power_off(void); > +void kernel_restart_prepare(char *cmd); > +void kernel_restart(char *cmd); > +void kernel_halt(void); > +void kernel_power_off(void); > > extern int C_A_D; /* for sysctl */ > void ctrl_alt_del(void); > @@ -77,15 +77,15 @@ void ctrl_alt_del(void); > #define POWEROFF_CMD_PATH_LEN 256 > extern char poweroff_cmd[POWEROFF_CMD_PATH_LEN]; > > -extern void orderly_poweroff(bool force); > -extern void orderly_reboot(void); > +void orderly_poweroff(bool force); > +void orderly_reboot(void); > void hw_protection_shutdown(const char *reason, int ms_until_forced); > > /* > * Emergency restart, callable from an interrupt handler. > */ > > -extern void emergency_restart(void); > +void emergency_restart(void); > #include <asm/emergency-restart.h> > > #endif /* _LINUX_REBOOT_H */ > -- > 2.33.1 >
10.12.2021 21:09, Rafael J. Wysocki пишет: > On Fri, Nov 26, 2021 at 7:02 PM Dmitry Osipenko <digetx@gmail.com> wrote: >> >> There is no need to annotate function prototypes with 'extern', it makes >> code less readable. Remove unnecessary annotations from <reboot.h>. >> >> Signed-off-by: Dmitry Osipenko <digetx@gmail.com> > > I'm not sure that this is really useful. > > Personally, I tend to respect the existing conventions like this. > > Surely, this change is not required for the rest of the series to work. Problem that such things start to spread all over the kernel with a copy-paste approach if there is nobody to clean up the code. This is not a common convention and sometimes it's getting corrected [1]. [1] https://git.kernel.org/linus/6d7434931
On Fri, Dec 10, 2021 at 7:16 PM Dmitry Osipenko <digetx@gmail.com> wrote: > > 10.12.2021 21:09, Rafael J. Wysocki пишет: > > On Fri, Nov 26, 2021 at 7:02 PM Dmitry Osipenko <digetx@gmail.com> wrote: > >> > >> There is no need to annotate function prototypes with 'extern', it makes > >> code less readable. Remove unnecessary annotations from <reboot.h>. > >> > >> Signed-off-by: Dmitry Osipenko <digetx@gmail.com> > > > > I'm not sure that this is really useful. > > > > Personally, I tend to respect the existing conventions like this. > > > > Surely, this change is not required for the rest of the series to work. > > Problem that such things start to spread all over the kernel with a > copy-paste approach if there is nobody to clean up the code. > > This is not a common convention and sometimes it's getting corrected [1]. > > [1] https://git.kernel.org/linus/6d7434931 In separate patches outside of series adding new features, if one is so inclined.
10.12.2021 21:35, Rafael J. Wysocki пишет: > On Fri, Dec 10, 2021 at 7:16 PM Dmitry Osipenko <digetx@gmail.com> wrote: >> >> 10.12.2021 21:09, Rafael J. Wysocki пишет: >>> On Fri, Nov 26, 2021 at 7:02 PM Dmitry Osipenko <digetx@gmail.com> wrote: >>>> >>>> There is no need to annotate function prototypes with 'extern', it makes >>>> code less readable. Remove unnecessary annotations from <reboot.h>. >>>> >>>> Signed-off-by: Dmitry Osipenko <digetx@gmail.com> >>> >>> I'm not sure that this is really useful. >>> >>> Personally, I tend to respect the existing conventions like this. >>> >>> Surely, this change is not required for the rest of the series to work. >> >> Problem that such things start to spread all over the kernel with a >> copy-paste approach if there is nobody to clean up the code. >> >> This is not a common convention and sometimes it's getting corrected [1]. >> >> [1] https://git.kernel.org/linus/6d7434931 > > In separate patches outside of series adding new features, if one is > so inclined. > Alright, I'll drop this patch then because it can't be done in parallel without creating the merge conflict. I'll try not to forget to come back to this later on.
diff --git a/include/linux/reboot.h b/include/linux/reboot.h index 7c288013a3ca..b7fa25726323 100644 --- a/include/linux/reboot.h +++ b/include/linux/reboot.h @@ -40,36 +40,36 @@ extern int reboot_cpu; extern int reboot_force; -extern int register_reboot_notifier(struct notifier_block *); -extern int unregister_reboot_notifier(struct notifier_block *); +int register_reboot_notifier(struct notifier_block *); +int unregister_reboot_notifier(struct notifier_block *); -extern int devm_register_reboot_notifier(struct device *, struct notifier_block *); +int devm_register_reboot_notifier(struct device *, struct notifier_block *); -extern int register_restart_handler(struct notifier_block *); -extern int unregister_restart_handler(struct notifier_block *); -extern void do_kernel_restart(char *cmd); +int register_restart_handler(struct notifier_block *); +int unregister_restart_handler(struct notifier_block *); +void do_kernel_restart(char *cmd); /* * Architecture-specific implementations of sys_reboot commands. */ -extern void migrate_to_reboot_cpu(void); -extern void machine_restart(char *cmd); -extern void machine_halt(void); -extern void machine_power_off(void); +void migrate_to_reboot_cpu(void); +void machine_restart(char *cmd); +void machine_halt(void); +void machine_power_off(void); -extern void machine_shutdown(void); +void machine_shutdown(void); struct pt_regs; -extern void machine_crash_shutdown(struct pt_regs *); +void machine_crash_shutdown(struct pt_regs *); /* * Architecture independent implementations of sys_reboot commands. */ -extern void kernel_restart_prepare(char *cmd); -extern void kernel_restart(char *cmd); -extern void kernel_halt(void); -extern void kernel_power_off(void); +void kernel_restart_prepare(char *cmd); +void kernel_restart(char *cmd); +void kernel_halt(void); +void kernel_power_off(void); extern int C_A_D; /* for sysctl */ void ctrl_alt_del(void); @@ -77,15 +77,15 @@ void ctrl_alt_del(void); #define POWEROFF_CMD_PATH_LEN 256 extern char poweroff_cmd[POWEROFF_CMD_PATH_LEN]; -extern void orderly_poweroff(bool force); -extern void orderly_reboot(void); +void orderly_poweroff(bool force); +void orderly_reboot(void); void hw_protection_shutdown(const char *reason, int ms_until_forced); /* * Emergency restart, callable from an interrupt handler. */ -extern void emergency_restart(void); +void emergency_restart(void); #include <asm/emergency-restart.h> #endif /* _LINUX_REBOOT_H */
There is no need to annotate function prototypes with 'extern', it makes code less readable. Remove unnecessary annotations from <reboot.h>. Signed-off-by: Dmitry Osipenko <digetx@gmail.com> --- include/linux/reboot.h | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-)