diff options
author | Ingo Molnar <mingo@kernel.org> | 2022-02-17 09:01:35 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2022-03-15 12:57:32 +0100 |
commit | c8f1cf98c722fdc968e5d7e3a0f6643c603e84d1 (patch) | |
tree | 0e7f921d41aa2eb743d106280be6f663d4664a4f | |
parent | 1b7fc7772b0d9196571b9e52de7265785064be9b (diff) | |
download | tip-c8f1cf98c722fdc968e5d7e3a0f6643c603e84d1.tar.gz |
headers/deps: Reduce dependencies on <linux/init.h>'s __init* attributes in header prototypes
Remove a couple of superfluous __init annotations from function prototypes (which don't need it).
Signed-off-by: Ingo Molnar <mingo@kernel.org>
28 files changed, 58 insertions, 60 deletions
diff --git a/arch/mips/include/asm/idle.h b/arch/mips/include/asm/idle.h index 0992cad9c632ec..85f229269ec5c5 100644 --- a/arch/mips/include/asm/idle.h +++ b/arch/mips/include/asm/idle.h @@ -15,7 +15,7 @@ static inline int using_rollback_handler(void) return cpu_wait == r4k_wait; } -extern void __init check_wait(void); +extern void check_wait(void); extern int mips_cpuidle_wait_enter(struct cpuidle_device *dev, struct cpuidle_driver *drv, int index); diff --git a/arch/mips/include/asm/irq.h b/arch/mips/include/asm/irq.h index e523184ecdbd23..e4d49d5a6eb42b 100644 --- a/arch/mips/include/asm/irq.h +++ b/arch/mips/include/asm/irq.h @@ -20,7 +20,7 @@ #define IRQ_STACK_SIZE THREAD_SIZE #define IRQ_STACK_START (IRQ_STACK_SIZE - 16) -extern void __init init_IRQ(void); +extern void init_IRQ(void); extern void *irq_stack[NR_CPUS]; /* diff --git a/arch/sparc/include/asm/irq_32.h b/arch/sparc/include/asm/irq_32.h index 43ec2609b81154..88e7724a8adf81 100644 --- a/arch/sparc/include/asm/irq_32.h +++ b/arch/sparc/include/asm/irq_32.h @@ -17,8 +17,8 @@ #define irq_canonicalize(irq) (irq) -void __init init_IRQ(void); -void __init sun4d_init_sbi_irq(void); +void init_IRQ(void); +void sun4d_init_sbi_irq(void); #define NO_IRQ 0xffffffff diff --git a/arch/sparc/include/asm/irq_64.h b/arch/sparc/include/asm/irq_64.h index 154df2cf19f42d..93ad3090c8fdf2 100644 --- a/arch/sparc/include/asm/irq_64.h +++ b/arch/sparc/include/asm/irq_64.h @@ -61,7 +61,7 @@ void sun4u_destroy_msi(unsigned int irq); unsigned int irq_alloc(unsigned int dev_handle, unsigned int dev_ino); void irq_free(unsigned int irq); -void __init init_IRQ(void); +void init_IRQ(void); void fixup_irqs(void); static inline void set_softint(unsigned long bits) diff --git a/arch/sparc/include/asm/nmi.h b/arch/sparc/include/asm/nmi.h index 90ee7863d9fe69..ce17948c62e899 100644 --- a/arch/sparc/include/asm/nmi.h +++ b/arch/sparc/include/asm/nmi.h @@ -2,7 +2,7 @@ #ifndef __NMI_H #define __NMI_H -int __init nmi_init(void); +int nmi_init(void); void perfctr_irq(int irq, struct pt_regs *regs); void nmi_adjust_hz(unsigned int new_hz); diff --git a/arch/sparc/include/asm/pgtable_32.h b/arch/sparc/include/asm/pgtable_32.h index 02de7eeff48520..a8372a5db5490f 100644 --- a/arch/sparc/include/asm/pgtable_32.h +++ b/arch/sparc/include/asm/pgtable_32.h @@ -40,7 +40,7 @@ struct page; void load_mmu(void); unsigned long calc_highpages(void); -unsigned long __init bootmem_init(unsigned long *pages_avail); +unsigned long bootmem_init(unsigned long *pages_avail); #define pte_ERROR(e) __builtin_trap() #define pmd_ERROR(e) __builtin_trap() diff --git a/arch/sparc/include/asm/setup.h b/arch/sparc/include/asm/setup.h index 72205684e51eae..6c0da2d72089c1 100644 --- a/arch/sparc/include/asm/setup.h +++ b/arch/sparc/include/asm/setup.h @@ -41,7 +41,7 @@ int sparc_floppy_request_irq(unsigned int irq, irq_handler_t irq_handler); extern unsigned long cmdline_memory_size; /* devices.c */ -void __init device_scan(void); +void device_scan(void); /* unaligned_32.c */ unsigned long safe_compute_effective_address(struct pt_regs *, unsigned int); @@ -49,7 +49,7 @@ unsigned long safe_compute_effective_address(struct pt_regs *, unsigned int); #endif #ifdef CONFIG_SPARC64 -void __init start_early_boot(void); +void start_early_boot(void); /* unaligned_64.c */ int handle_ldf_stq(u32 insn, struct pt_regs *regs); diff --git a/arch/sparc/kernel/kernel.h b/arch/sparc/kernel/kernel.h index 87dfbfc2bc713b..4189095f559d50 100644 --- a/arch/sparc/kernel/kernel.h +++ b/arch/sparc/kernel/kernel.h @@ -63,7 +63,7 @@ void do_signal32(struct pt_regs * regs); asmlinkage int do_sys32_sigstack(u32 u_ssptr, u32 u_ossptr, unsigned long sp); /* time_64.c */ -void __init time_init_early(void); +void time_init_early(void); /* compat_audit.c */ extern unsigned int sparc32_dir_class[]; @@ -101,9 +101,9 @@ void sun4m_clear_profile_irq(int cpu); /* sun4m_smp.c */ void sun4m_cpu_pre_starting(void *arg); void sun4m_cpu_pre_online(void *arg); -void __init smp4m_boot_cpus(void); +void smp4m_boot_cpus(void); int smp4m_boot_one_cpu(int i, struct task_struct *idle); -void __init smp4m_smp_done(void); +void smp4m_smp_done(void); void smp4m_cross_call_irq(void); void smp4m_percpu_timer_interrupt(struct pt_regs *regs); @@ -122,9 +122,9 @@ void sun4d_free_irq(unsigned int irq, void *dev_id); /* sun4d_smp.c */ void sun4d_cpu_pre_starting(void *arg); void sun4d_cpu_pre_online(void *arg); -void __init smp4d_boot_cpus(void); +void smp4d_boot_cpus(void); int smp4d_boot_one_cpu(int i, struct task_struct *idle); -void __init smp4d_smp_done(void); +void smp4d_smp_done(void); void smp4d_cross_call_irq(void); void smp4d_percpu_timer_interrupt(struct pt_regs *regs); @@ -180,15 +180,15 @@ asmlinkage void user_unaligned_trap(struct pt_regs *regs, unsigned int insn); void try_to_clear_window_buffer(struct pt_regs *regs, int who); /* auxio_32.c */ -void __init auxio_probe(void); -void __init auxio_power_probe(void); +void auxio_probe(void); +void auxio_power_probe(void); /* pcic.c */ extern void __iomem *pcic_regs; void pcic_nmi(unsigned int pend, struct pt_regs *regs); /* time_32.c */ -void __init time_init(void); +void time_init(void); #else /* CONFIG_SPARC32 */ #endif /* CONFIG_SPARC32 */ diff --git a/arch/sparc/mm/mm_32.h b/arch/sparc/mm/mm_32.h index ee55f10806343a..a43e342017df18 100644 --- a/arch/sparc/mm/mm_32.h +++ b/arch/sparc/mm/mm_32.h @@ -14,7 +14,7 @@ extern int flush_page_for_dma_global; extern void (*poke_srmmu)(void); -void __init srmmu_paging_init(void); +void srmmu_paging_init(void); /* iommu.c */ void ld_mmu_iommu(void); diff --git a/arch/x86/include/asm/fpu/xstate.h b/arch/x86/include/asm/fpu/xstate.h index dd52bebe300669..e76d68bd0cd865 100644 --- a/arch/x86/include/asm/fpu/xstate.h +++ b/arch/x86/include/asm/fpu/xstate.h @@ -103,8 +103,7 @@ extern u64 xstate_fx_sw_bytes[USER_XSTATE_FX_SW_WORDS]; -extern void __init update_regset_xstate_info(unsigned int size, - u64 xstate_mask); +extern void update_regset_xstate_info(unsigned int size, u64 xstate_mask); int xfeature_size(int xfeature_nr); diff --git a/drivers/scsi/ufs/ufs-debugfs.h b/drivers/scsi/ufs/ufs-debugfs.h index 97548a3f90eb8f..4a7e3855a61319 100644 --- a/drivers/scsi/ufs/ufs-debugfs.h +++ b/drivers/scsi/ufs/ufs-debugfs.h @@ -8,7 +8,7 @@ struct ufs_hba; #ifdef CONFIG_DEBUG_FS -void __init ufs_debugfs_init(void); +void ufs_debugfs_init(void); void ufs_debugfs_exit(void); void ufs_debugfs_hba_init(struct ufs_hba *hba); void ufs_debugfs_hba_exit(struct ufs_hba *hba); diff --git a/fs/gfs2/glock.h b/fs/gfs2/glock.h index b78244f62a23ed..a15f145c638472 100644 --- a/fs/gfs2/glock.h +++ b/fs/gfs2/glock.h @@ -271,7 +271,7 @@ extern void gfs2_glock_thaw(struct gfs2_sbd *sdp); extern void gfs2_glock_add_to_lru(struct gfs2_glock *gl); extern void gfs2_glock_free(struct gfs2_glock *gl); -extern int __init gfs2_glock_init(void); +extern int gfs2_glock_init(void); extern void gfs2_glock_exit(void); extern void gfs2_create_debugfs_file(struct gfs2_sbd *sdp); diff --git a/fs/internal.h b/fs/internal.h index 4fa1d4e090e4d0..028d4b53751a6a 100644 --- a/fs/internal.h +++ b/fs/internal.h @@ -24,7 +24,7 @@ struct statx; * block/bdev.c */ #ifdef CONFIG_BLOCK -extern void __init bdev_cache_init(void); +extern void bdev_cache_init(void); void emergency_thaw_bdev(struct super_block *sb); #else @@ -46,7 +46,7 @@ int __block_write_begin_int(struct folio *folio, loff_t pos, unsigned len, /* * char_dev.c */ -extern void __init chrdev_init(void); +extern void chrdev_init(void); /* * fs_context.c @@ -81,7 +81,7 @@ extern int finish_automount(struct vfsmount *, struct path *); extern int sb_prepare_remount_readonly(struct super_block *); -extern void __init mnt_init(void); +extern void mnt_init(void); extern int __mnt_want_write_file(struct file *); extern void __mnt_drop_write_file(struct file *); diff --git a/fs/pstore/internal.h b/fs/pstore/internal.h index b947241e31c3b4..d42c0c4cc0596a 100644 --- a/fs/pstore/internal.h +++ b/fs/pstore/internal.h @@ -48,7 +48,7 @@ extern void pstore_record_init(struct pstore_record *record, struct pstore_info *psi); /* Called during pstore init/exit. */ -int __init pstore_init_fs(void); -void __exit pstore_exit_fs(void); +int pstore_init_fs(void); +void pstore_exit_fs(void); #endif diff --git a/include/linux/fs_api.h b/include/linux/fs_api.h index fa7624218ef1dd..e3195701a0d4d0 100644 --- a/include/linux/fs_api.h +++ b/include/linux/fs_api.h @@ -33,10 +33,10 @@ #include <uapi/linux/fs.h> -extern void __init inode_init(void); -extern void __init inode_init_early(void); -extern void __init files_init(void); -extern void __init files_maxfiles_init(void); +extern void inode_init(void); +extern void inode_init_early(void); +extern void files_init(void); +extern void files_maxfiles_init(void); extern unsigned long get_max_files(void); /* @@ -1189,8 +1189,8 @@ extern int finish_open(struct file *file, struct dentry *dentry, extern int finish_no_open(struct file *file, struct dentry *dentry); /* fs/dcache.c */ -extern void __init vfs_caches_init_early(void); -extern void __init vfs_caches_init(void); +extern void vfs_caches_init_early(void); +extern void vfs_caches_init(void); extern struct kmem_cache *names_cachep; @@ -1977,7 +1977,7 @@ ssize_t simple_attr_write(struct file *file, const char __user *buf, size_t len, loff_t *ppos); struct ctl_table; -int __init list_bdev_fs_names(char *buf, size_t size); +int list_bdev_fs_names(char *buf, size_t size); #define __FMODE_EXEC ((__force int) FMODE_EXEC) #define __FMODE_NONOTIFY ((__force int) FMODE_NONOTIFY) diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h index bbef3f5f21dc53..2cb0585c4e682a 100644 --- a/include/linux/ftrace.h +++ b/include/linux/ftrace.h @@ -592,8 +592,7 @@ ssize_t ftrace_notrace_write(struct file *file, const char __user *ubuf, size_t cnt, loff_t *ppos); int ftrace_regex_release(struct inode *inode, struct file *file); -void __init -ftrace_set_early_filter(struct ftrace_ops *ops, char *buf, int enable); +void ftrace_set_early_filter(struct ftrace_ops *ops, char *buf, int enable); /* defined in arch */ extern int ftrace_ip_converted(unsigned long ip); diff --git a/include/linux/gfp_api.h b/include/linux/gfp_api.h index 2858da86f23ff7..447534fb99c562 100644 --- a/include/linux/gfp_api.h +++ b/include/linux/gfp_api.h @@ -294,7 +294,7 @@ extern unsigned long get_zeroed_page(gfp_t gfp_mask); void *alloc_pages_exact(size_t size, gfp_t gfp_mask) __alloc_size(1); void free_pages_exact(void *virt, size_t size); -__meminit void *alloc_pages_exact_nid(int nid, size_t size, gfp_t gfp_mask) __alloc_size(2); +void *alloc_pages_exact_nid(int nid, size_t size, gfp_t gfp_mask) __alloc_size(2); #define __get_free_page(gfp_mask) \ __get_free_pages((gfp_mask), 0) diff --git a/include/linux/kfence.h b/include/linux/kfence.h index a96bb1519f0b76..90a257a16f54d0 100644 --- a/include/linux/kfence.h +++ b/include/linux/kfence.h @@ -62,7 +62,7 @@ static __always_inline bool is_kfence_address(const void *addr) /** * kfence_alloc_pool() - allocate the KFENCE pool via memblock */ -void __init kfence_alloc_pool(void); +void kfence_alloc_pool(void); /** * kfence_init() - perform KFENCE initialization at boot time @@ -70,7 +70,7 @@ void __init kfence_alloc_pool(void); * Requires that kfence_alloc_pool() was called before. This sets up the * allocation gate timer, and requires that workqueues are available. */ -void __init kfence_init(void); +void kfence_init(void); /** * kfence_shutdown_cache() - handle shutdown_cache() for KFENCE objects diff --git a/include/linux/mm_api.h b/include/linux/mm_api.h index d211f06fd8c172..eafc46f3fabb08 100644 --- a/include/linux/mm_api.h +++ b/include/linux/mm_api.h @@ -1521,8 +1521,8 @@ static inline void mm_dec_nr_ptes(struct mm_struct *mm) {} int __pte_alloc(struct mm_struct *mm, pmd_t *pmd); int __pte_alloc_kernel(pmd_t *pmd); -extern void __init pagecache_init(void); -extern void __init free_area_init_memoryless_node(int nid); +extern void pagecache_init(void); +extern void free_area_init_memoryless_node(int nid); extern void free_initmem(void); /* @@ -1608,7 +1608,7 @@ static inline int early_pfn_to_nid(unsigned long pfn) } #else /* please see mm/page_alloc.c */ -extern int __meminit early_pfn_to_nid(unsigned long pfn); +extern int early_pfn_to_nid(unsigned long pfn); #endif extern void set_dma_reserve(unsigned long new_dma_reserve); @@ -1617,9 +1617,9 @@ extern void memmap_init_range(unsigned long, int, unsigned long, struct vmem_altmap *, int migratetype); extern void setup_per_zone_wmarks(void); extern void calculate_min_free_kbytes(void); -extern int __meminit init_per_zone_wmark_min(void); +extern int init_per_zone_wmark_min(void); extern void mem_init(void); -extern void __init mmap_init(void); +extern void mmap_init(void); extern void show_mem(unsigned int flags, nodemask_t *nodemask); extern long si_mem_available(void); extern void si_meminfo(struct sysinfo * val); @@ -2336,7 +2336,7 @@ static inline bool page_is_guard(struct page *page) { return false; } #endif /* CONFIG_DEBUG_PAGEALLOC */ #if MAX_NUMNODES > 1 -void __init setup_nr_node_ids(void); +void setup_nr_node_ids(void); #else static inline void setup_nr_node_ids(void) {} #endif diff --git a/include/linux/padata.h b/include/linux/padata.h index 495b16b6b4d729..5fd8598b4498f1 100644 --- a/include/linux/padata.h +++ b/include/linux/padata.h @@ -177,9 +177,9 @@ struct padata_instance { }; #ifdef CONFIG_PADATA -extern void __init padata_init(void); +extern void padata_init(void); #else -static inline void __init padata_init(void) {} +static inline void padata_init(void) {} #endif extern struct padata_instance *padata_alloc(const char *name); @@ -189,7 +189,7 @@ extern void padata_free_shell(struct padata_shell *ps); extern int padata_do_parallel(struct padata_shell *ps, struct padata_priv *padata, int *cb_cpu); extern void padata_do_serial(struct padata_priv *padata); -extern void __init padata_do_multithreaded(struct padata_mt_job *job); +extern void padata_do_multithreaded(struct padata_mt_job *job); extern int padata_set_cpumask(struct padata_instance *pinst, int cpumask_type, cpumask_var_t cpumask); #endif diff --git a/include/linux/pgtable_api.h b/include/linux/pgtable_api.h index 191bb582d9beb7..cd2d5d1714598e 100644 --- a/include/linux/pgtable_api.h +++ b/include/linux/pgtable_api.h @@ -1470,7 +1470,7 @@ int phys_mem_access_prot_allowed(struct file *file, unsigned long pfn, static inline void init_espfix_bsp(void) { } #endif -extern void __init pgtable_cache_init(void); +extern void pgtable_cache_init(void); #ifndef __HAVE_ARCH_PFN_MODIFY_ALLOWED static inline bool pfn_modify_allowed(unsigned long pfn, pgprot_t prot) diff --git a/include/linux/ptp_classify.h b/include/linux/ptp_classify.h index 9afd34a2d36c5c..09d3471814bfab 100644 --- a/include/linux/ptp_classify.h +++ b/include/linux/ptp_classify.h @@ -126,7 +126,7 @@ static inline u8 ptp_get_msgtype(const struct ptp_header *hdr, return msgtype; } -void __init ptp_classifier_init(void); +void ptp_classifier_init(void); #else static inline void ptp_classifier_init(void) { diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h index 06a2bed6b2375f..ee87c611fe4a98 100644 --- a/include/linux/serial_core.h +++ b/include/linux/serial_core.h @@ -384,7 +384,7 @@ extern int of_setup_earlycon(const struct earlycon_id *match, const char *options); #ifdef CONFIG_SERIAL_EARLYCON -extern bool earlycon_acpi_spcr_enable __initdata; +extern bool earlycon_acpi_spcr_enable; int setup_earlycon(char *buf); #else static const bool earlycon_acpi_spcr_enable EARLYCON_USED_OR_UNUSED; diff --git a/include/linux/sunrpc/auth.h b/include/linux/sunrpc/auth.h index 98da816b5fc2ad..834ca24e763413 100644 --- a/include/linux/sunrpc/auth.h +++ b/include/linux/sunrpc/auth.h @@ -144,8 +144,8 @@ struct rpc_credops { extern const struct rpc_authops authunix_ops; extern const struct rpc_authops authnull_ops; -int __init rpc_init_authunix(void); -int __init rpcauth_init_module(void); +int rpc_init_authunix(void); +int rpcauth_init_module(void); void rpcauth_remove_module(void); void rpc_destroy_authunix(void); diff --git a/include/xen/page.h b/include/xen/page.h index 994690620d4c92..a8099f68dd1761 100644 --- a/include/xen/page.h +++ b/include/xen/page.h @@ -51,7 +51,7 @@ struct xen_memory_region { #define XEN_EXTRA_MEM_MAX_REGIONS 128 /* == E820_MAX_ENTRIES_ZEROPAGE */ -extern __initdata +extern struct xen_memory_region xen_extra_mem[XEN_EXTRA_MEM_MAX_REGIONS]; extern unsigned long xen_released_pages; diff --git a/kernel/cgroup/cgroup-internal.h b/kernel/cgroup/cgroup-internal.h index e0ef0f0485d681..7a14760c2a8478 100644 --- a/kernel/cgroup/cgroup-internal.h +++ b/kernel/cgroup/cgroup-internal.h @@ -16,7 +16,7 @@ extern spinlock_t trace_cgroup_path_lock; extern char trace_cgroup_path[TRACE_CGROUP_PATH_LEN]; extern bool cgroup_debug; -extern void __init enable_debug_cgroup(void); +extern void enable_debug_cgroup(void); /* * cgroup_path() takes a spin lock. It is good practice not to take diff --git a/net/ieee802154/ieee802154.h b/net/ieee802154/ieee802154.h index c5d91f78301ad1..9ef2875b82d5c5 100644 --- a/net/ieee802154/ieee802154.h +++ b/net/ieee802154/ieee802154.h @@ -5,7 +5,7 @@ #ifndef IEEE_802154_LOCAL_H #define IEEE_802154_LOCAL_H -int __init ieee802154_nl_init(void); +int ieee802154_nl_init(void); void ieee802154_nl_exit(void); #define IEEE802154_OP(_cmd, _func) \ diff --git a/net/nfc/nfc.h b/net/nfc/nfc.h index b1261538e99e17..1a4e5f7ea4dc7c 100644 --- a/net/nfc/nfc.h +++ b/net/nfc/nfc.h @@ -54,15 +54,15 @@ int nfc_llcp_set_remote_gb(struct nfc_dev *dev, const u8 *gb, u8 gb_len); u8 *nfc_llcp_general_bytes(struct nfc_dev *dev, size_t *general_bytes_len); int nfc_llcp_data_received(struct nfc_dev *dev, struct sk_buff *skb); struct nfc_llcp_local *nfc_llcp_find_local(struct nfc_dev *dev); -int __init nfc_llcp_init(void); +int nfc_llcp_init(void); void nfc_llcp_exit(void); void nfc_llcp_free_sdp_tlv(struct nfc_llcp_sdp_tlv *sdp); void nfc_llcp_free_sdp_tlv_list(struct hlist_head *head); -int __init rawsock_init(void); +int rawsock_init(void); void rawsock_exit(void); -int __init af_nfc_init(void); +int af_nfc_init(void); void af_nfc_exit(void); int nfc_proto_register(const struct nfc_protocol *nfc_proto); void nfc_proto_unregister(const struct nfc_protocol *nfc_proto); @@ -70,7 +70,7 @@ void nfc_proto_unregister(const struct nfc_protocol *nfc_proto); extern int nfc_devlist_generation; extern struct mutex nfc_devlist_mutex; -int __init nfc_genl_init(void); +int nfc_genl_init(void); void nfc_genl_exit(void); void nfc_genl_data_init(struct nfc_genl_data *genl_data); |