Commit bd721ea7 authored by Fabian Frederick's avatar Fabian Frederick Committed by Linus Torvalds

treewide: replace obsolete _refok by __ref

There was only one use of __initdata_refok and __exit_refok

__init_refok was used 46 times against 82 for __ref.

Those definitions are obsolete since commit 312b1485 ("Introduce new
section reference annotations tags: __ref, __refdata, __refconst")

This patch removes the following compatibility definitions and replaces
them treewide.

/* compatibility defines */
#define __init_refok     __ref
#define __initdata_refok __refdata
#define __exit_refok     __ref

I can also provide separate patches if necessary.
(One patch per tree and check in 1 month or 2 to remove old definitions)

[akpm@linux-foundation.org: coding-style fixes]
Link: http://lkml.kernel.org/r/1466796271-3043-1-git-send-email-fabf@skynet.beSigned-off-by: default avatarFabian Frederick <fabf@skynet.be>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent ca945e71
...@@ -137,7 +137,7 @@ ...@@ -137,7 +137,7 @@
#define __initmv __initdata #define __initmv __initdata
#define ALIAS_MV(x) #define ALIAS_MV(x)
#else #else
#define __initmv __initdata_refok #define __initmv __refdata
/* GCC actually has a syntax for defining aliases, but is under some /* GCC actually has a syntax for defining aliases, but is under some
delusion that you shouldn't be able to declare it extern somewhere delusion that you shouldn't be able to declare it extern somewhere
......
...@@ -220,7 +220,7 @@ void __init mem_init(void) ...@@ -220,7 +220,7 @@ void __init mem_init(void)
/* /*
* free_initmem: Free all the __init memory. * free_initmem: Free all the __init memory.
*/ */
void __init_refok free_initmem(void) void __ref free_initmem(void)
{ {
free_initmem_default(-1); free_initmem_default(-1);
} }
......
...@@ -320,11 +320,11 @@ static struct impd1_device impd1_devs[] = { ...@@ -320,11 +320,11 @@ static struct impd1_device impd1_devs[] = {
#define IMPD1_VALID_IRQS 0x00000bffU #define IMPD1_VALID_IRQS 0x00000bffU
/* /*
* As this module is bool, it is OK to have this as __init_refok() - no * As this module is bool, it is OK to have this as __ref() - no
* probe calls will be done after the initial system bootup, as devices * probe calls will be done after the initial system bootup, as devices
* are discovered as part of the machine startup. * are discovered as part of the machine startup.
*/ */
static int __init_refok impd1_probe(struct lm_device *dev) static int __ref impd1_probe(struct lm_device *dev)
{ {
struct impd1_module *impd1; struct impd1_module *impd1;
int irq_base; int irq_base;
......
...@@ -343,7 +343,7 @@ void __init mv78xx0_init_early(void) ...@@ -343,7 +343,7 @@ void __init mv78xx0_init_early(void)
DDR_WINDOW_CPU1_BASE, DDR_WINDOW_CPU_SZ); DDR_WINDOW_CPU1_BASE, DDR_WINDOW_CPU_SZ);
} }
void __init_refok mv78xx0_timer_init(void) void __ref mv78xx0_timer_init(void)
{ {
orion_time_init(BRIDGE_VIRT_BASE, BRIDGE_INT_TIMER1_CLR, orion_time_init(BRIDGE_VIRT_BASE, BRIDGE_INT_TIMER1_CLR,
IRQ_MV78XX0_TIMER_1, get_tclk()); IRQ_MV78XX0_TIMER_1, get_tclk());
......
...@@ -112,7 +112,7 @@ void __init free_initrd_mem(unsigned long start, unsigned long end) ...@@ -112,7 +112,7 @@ void __init free_initrd_mem(unsigned long start, unsigned long end)
} }
#endif #endif
void __init_refok free_initmem(void) void __ref free_initmem(void)
{ {
#if defined CONFIG_RAMKERNEL && !defined CONFIG_MPU #if defined CONFIG_RAMKERNEL && !defined CONFIG_MPU
free_initmem_default(-1); free_initmem_default(-1);
......
...@@ -93,7 +93,7 @@ void __init mem_init(void) ...@@ -93,7 +93,7 @@ void __init mem_init(void)
* Todo: free pages between __init_begin and __init_end; possibly * Todo: free pages between __init_begin and __init_end; possibly
* some devtree related stuff as well. * some devtree related stuff as well.
*/ */
void __init_refok free_initmem(void) void __ref free_initmem(void)
{ {
} }
......
...@@ -1831,7 +1831,7 @@ format_mca_init_stack(void *mca_data, unsigned long offset, ...@@ -1831,7 +1831,7 @@ format_mca_init_stack(void *mca_data, unsigned long offset,
} }
/* Caller prevents this from being called after init */ /* Caller prevents this from being called after init */
static void * __init_refok mca_bootmem(void) static void * __ref mca_bootmem(void)
{ {
return __alloc_bootmem(sizeof(struct ia64_mca_cpu), return __alloc_bootmem(sizeof(struct ia64_mca_cpu),
KERNEL_STACK_SIZE, 0); KERNEL_STACK_SIZE, 0);
......
...@@ -414,7 +414,7 @@ void __init *early_get_page(void) ...@@ -414,7 +414,7 @@ void __init *early_get_page(void)
#endif /* CONFIG_MMU */ #endif /* CONFIG_MMU */
void * __init_refok alloc_maybe_bootmem(size_t size, gfp_t mask) void * __ref alloc_maybe_bootmem(size_t size, gfp_t mask)
{ {
if (mem_init_done) if (mem_init_done)
return kmalloc(size, mask); return kmalloc(size, mask);
...@@ -422,7 +422,7 @@ void * __init_refok alloc_maybe_bootmem(size_t size, gfp_t mask) ...@@ -422,7 +422,7 @@ void * __init_refok alloc_maybe_bootmem(size_t size, gfp_t mask)
return alloc_bootmem(size); return alloc_bootmem(size);
} }
void * __init_refok zalloc_maybe_bootmem(size_t size, gfp_t mask) void * __ref zalloc_maybe_bootmem(size_t size, gfp_t mask)
{ {
void *p; void *p;
......
...@@ -234,7 +234,7 @@ unsigned long iopa(unsigned long addr) ...@@ -234,7 +234,7 @@ unsigned long iopa(unsigned long addr)
return pa; return pa;
} }
__init_refok pte_t *pte_alloc_one_kernel(struct mm_struct *mm, __ref pte_t *pte_alloc_one_kernel(struct mm_struct *mm,
unsigned long address) unsigned long address)
{ {
pte_t *pte; pte_t *pte;
......
...@@ -504,7 +504,7 @@ void free_initrd_mem(unsigned long start, unsigned long end) ...@@ -504,7 +504,7 @@ void free_initrd_mem(unsigned long start, unsigned long end)
void (*free_init_pages_eva)(void *begin, void *end) = NULL; void (*free_init_pages_eva)(void *begin, void *end) = NULL;
void __init_refok free_initmem(void) void __ref free_initmem(void)
{ {
prom_free_prom_memory(); prom_free_prom_memory();
/* /*
......
...@@ -268,7 +268,7 @@ static int txx9_i8259_irq_setup(int irq) ...@@ -268,7 +268,7 @@ static int txx9_i8259_irq_setup(int irq)
return err; return err;
} }
static void __init_refok quirk_slc90e66_bridge(struct pci_dev *dev) static void __ref quirk_slc90e66_bridge(struct pci_dev *dev)
{ {
int irq; /* PCI/ISA Bridge interrupt */ int irq; /* PCI/ISA Bridge interrupt */
u8 reg_64; u8 reg_64;
......
...@@ -89,7 +89,7 @@ void __init free_initrd_mem(unsigned long start, unsigned long end) ...@@ -89,7 +89,7 @@ void __init free_initrd_mem(unsigned long start, unsigned long end)
} }
#endif #endif
void __init_refok free_initmem(void) void __ref free_initmem(void)
{ {
free_initmem_default(-1); free_initmem_default(-1);
} }
......
...@@ -38,7 +38,7 @@ static unsigned int fixmaps_used __initdata; ...@@ -38,7 +38,7 @@ static unsigned int fixmaps_used __initdata;
* have to convert them into an offset in a page-aligned mapping, but the * have to convert them into an offset in a page-aligned mapping, but the
* caller shouldn't need to know that small detail. * caller shouldn't need to know that small detail.
*/ */
void __iomem *__init_refok void __iomem *__ref
__ioremap(phys_addr_t addr, unsigned long size, pgprot_t prot) __ioremap(phys_addr_t addr, unsigned long size, pgprot_t prot)
{ {
phys_addr_t p; phys_addr_t p;
...@@ -116,7 +116,7 @@ void iounmap(void *addr) ...@@ -116,7 +116,7 @@ void iounmap(void *addr)
* the memblock infrastructure. * the memblock infrastructure.
*/ */
pte_t __init_refok *pte_alloc_one_kernel(struct mm_struct *mm, pte_t __ref *pte_alloc_one_kernel(struct mm_struct *mm,
unsigned long address) unsigned long address)
{ {
pte_t *pte; pte_t *pte;
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
#include <asm/setup.h> #include <asm/setup.h>
void * __init_refok zalloc_maybe_bootmem(size_t size, gfp_t mask) void * __ref zalloc_maybe_bootmem(size_t size, gfp_t mask)
{ {
void *p; void *p;
......
...@@ -79,7 +79,7 @@ void pgd_free(struct mm_struct *mm, pgd_t *pgd) ...@@ -79,7 +79,7 @@ void pgd_free(struct mm_struct *mm, pgd_t *pgd)
#endif #endif
} }
__init_refok pte_t *pte_alloc_one_kernel(struct mm_struct *mm, unsigned long address) __ref pte_t *pte_alloc_one_kernel(struct mm_struct *mm, unsigned long address)
{ {
pte_t *pte; pte_t *pte;
......
...@@ -353,12 +353,12 @@ static int pmac_late_init(void) ...@@ -353,12 +353,12 @@ static int pmac_late_init(void)
machine_late_initcall(powermac, pmac_late_init); machine_late_initcall(powermac, pmac_late_init);
/* /*
* This is __init_refok because we check for "initializing" before * This is __ref because we check for "initializing" before
* touching any of the __init sensitive things and "initializing" * touching any of the __init sensitive things and "initializing"
* will be false after __init time. This can't be __init because it * will be false after __init time. This can't be __init because it
* can be called whenever a disk is first accessed. * can be called whenever a disk is first accessed.
*/ */
void __init_refok note_bootable_part(dev_t dev, int part, int goodness) void __ref note_bootable_part(dev_t dev, int part, int goodness)
{ {
char *p; char *p;
......
...@@ -189,7 +189,7 @@ static int __init ps3_setup_gelic_device( ...@@ -189,7 +189,7 @@ static int __init ps3_setup_gelic_device(
return result; return result;
} }
static int __init_refok ps3_setup_uhc_device( static int __ref ps3_setup_uhc_device(
const struct ps3_repository_device *repo, enum ps3_match_id match_id, const struct ps3_repository_device *repo, enum ps3_match_id match_id,
enum ps3_interrupt_type interrupt_type, enum ps3_reg_type reg_type) enum ps3_interrupt_type interrupt_type, enum ps3_reg_type reg_type)
{ {
......
...@@ -112,7 +112,7 @@ int msi_bitmap_reserve_dt_hwirqs(struct msi_bitmap *bmp) ...@@ -112,7 +112,7 @@ int msi_bitmap_reserve_dt_hwirqs(struct msi_bitmap *bmp)
return 0; return 0;
} }
int __init_refok msi_bitmap_alloc(struct msi_bitmap *bmp, unsigned int irq_count, int __ref msi_bitmap_alloc(struct msi_bitmap *bmp, unsigned int irq_count,
struct device_node *of_node) struct device_node *of_node)
{ {
int size; int size;
......
...@@ -91,7 +91,7 @@ void free_initrd_mem(unsigned long start, unsigned long end) ...@@ -91,7 +91,7 @@ void free_initrd_mem(unsigned long start, unsigned long end)
} }
#endif #endif
void __init_refok free_initmem(void) void __ref free_initmem(void)
{ {
free_initmem_default(POISON_FREE_INITMEM); free_initmem_default(POISON_FREE_INITMEM);
} }
......
...@@ -221,7 +221,7 @@ pcibios_bus_report_status_early(struct pci_channel *hose, ...@@ -221,7 +221,7 @@ pcibios_bus_report_status_early(struct pci_channel *hose,
* We can't use pci_find_device() here since we are * We can't use pci_find_device() here since we are
* called from interrupt context. * called from interrupt context.
*/ */
static void __init_refok static void __ref
pcibios_bus_report_status(struct pci_bus *bus, unsigned int status_mask, pcibios_bus_report_status(struct pci_bus *bus, unsigned int status_mask,
int warn) int warn)
{ {
...@@ -256,7 +256,7 @@ pcibios_bus_report_status(struct pci_bus *bus, unsigned int status_mask, ...@@ -256,7 +256,7 @@ pcibios_bus_report_status(struct pci_bus *bus, unsigned int status_mask,
pcibios_bus_report_status(dev->subordinate, status_mask, warn); pcibios_bus_report_status(dev->subordinate, status_mask, warn);
} }
void __init_refok pcibios_report_status(unsigned int status_mask, int warn) void __ref pcibios_report_status(unsigned int status_mask, int warn)
{ {
struct pci_channel *hose; struct pci_channel *hose;
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
* have to convert them into an offset in a page-aligned mapping, but the * have to convert them into an offset in a page-aligned mapping, but the
* caller shouldn't need to know that small detail. * caller shouldn't need to know that small detail.
*/ */
void __iomem * __init_refok void __iomem * __ref
__ioremap_caller(phys_addr_t phys_addr, unsigned long size, __ioremap_caller(phys_addr_t phys_addr, unsigned long size,
pgprot_t pgprot, void *caller) pgprot_t pgprot, void *caller)
{ {
......
...@@ -208,7 +208,7 @@ static int __meminit save_mr(struct map_range *mr, int nr_range, ...@@ -208,7 +208,7 @@ static int __meminit save_mr(struct map_range *mr, int nr_range,
* adjust the page_size_mask for small range to go with * adjust the page_size_mask for small range to go with
* big page size instead small one if nearby are ram too. * big page size instead small one if nearby are ram too.
*/ */
static void __init_refok adjust_range_page_size_mask(struct map_range *mr, static void __ref adjust_range_page_size_mask(struct map_range *mr,
int nr_range) int nr_range)
{ {
int i; int i;
...@@ -396,7 +396,7 @@ bool pfn_range_is_mapped(unsigned long start_pfn, unsigned long end_pfn) ...@@ -396,7 +396,7 @@ bool pfn_range_is_mapped(unsigned long start_pfn, unsigned long end_pfn)
* This runs before bootmem is initialized and gets pages directly from * This runs before bootmem is initialized and gets pages directly from
* the physical memory. To access them they are temporarily mapped. * the physical memory. To access them they are temporarily mapped.
*/ */
unsigned long __init_refok init_memory_mapping(unsigned long start, unsigned long __ref init_memory_mapping(unsigned long start,
unsigned long end) unsigned long end)
{ {
struct map_range mr[NR_RANGE_MR]; struct map_range mr[NR_RANGE_MR];
......
...@@ -44,7 +44,7 @@ early_initcall(early_efi_map_fb); ...@@ -44,7 +44,7 @@ early_initcall(early_efi_map_fb);
* In case earlyprintk=efi,keep we have the whole framebuffer mapped already * In case earlyprintk=efi,keep we have the whole framebuffer mapped already
* so just return the offset efi_fb + start. * so just return the offset efi_fb + start.
*/ */
static __init_refok void *early_efi_map(unsigned long start, unsigned long len) static __ref void *early_efi_map(unsigned long start, unsigned long len)
{ {
unsigned long base; unsigned long base;
...@@ -56,7 +56,7 @@ static __init_refok void *early_efi_map(unsigned long start, unsigned long len) ...@@ -56,7 +56,7 @@ static __init_refok void *early_efi_map(unsigned long start, unsigned long len)
return early_ioremap(base + start, len); return early_ioremap(base + start, len);
} }
static __init_refok void early_efi_unmap(void *addr, unsigned long len) static __ref void early_efi_unmap(void *addr, unsigned long len)
{ {
if (!efi_fb) if (!efi_fb)
early_iounmap(addr, len); early_iounmap(addr, len);
......
...@@ -309,7 +309,7 @@ static void acpi_unmap(acpi_physical_address pg_off, void __iomem *vaddr) ...@@ -309,7 +309,7 @@ static void acpi_unmap(acpi_physical_address pg_off, void __iomem *vaddr)
* During early init (when acpi_gbl_permanent_mmap has not been set yet) this * During early init (when acpi_gbl_permanent_mmap has not been set yet) this
* routine simply calls __acpi_map_table() to get the job done. * routine simply calls __acpi_map_table() to get the job done.
*/ */
void __iomem *__init_refok void __iomem *__ref
acpi_os_map_iomem(acpi_physical_address phys, acpi_size size) acpi_os_map_iomem(acpi_physical_address phys, acpi_size size)
{ {
struct acpi_ioremap *map; struct acpi_ioremap *map;
...@@ -362,8 +362,7 @@ acpi_os_map_iomem(acpi_physical_address phys, acpi_size size) ...@@ -362,8 +362,7 @@ acpi_os_map_iomem(acpi_physical_address phys, acpi_size size)
} }
EXPORT_SYMBOL_GPL(acpi_os_map_iomem); EXPORT_SYMBOL_GPL(acpi_os_map_iomem);
void *__init_refok void *__ref acpi_os_map_memory(acpi_physical_address phys, acpi_size size)
acpi_os_map_memory(acpi_physical_address phys, acpi_size size)
{ {
return (void *)acpi_os_map_iomem(phys, size); return (void *)acpi_os_map_iomem(phys, size);
} }
......
...@@ -370,7 +370,7 @@ int unregister_cpu_under_node(unsigned int cpu, unsigned int nid) ...@@ -370,7 +370,7 @@ int unregister_cpu_under_node(unsigned int cpu, unsigned int nid)
#ifdef CONFIG_MEMORY_HOTPLUG_SPARSE #ifdef CONFIG_MEMORY_HOTPLUG_SPARSE
#define page_initialized(page) (page->lru.next) #define page_initialized(page) (page->lru.next)
static int __init_refok get_nid_for_pfn(unsigned long pfn) static int __ref get_nid_for_pfn(unsigned long pfn)
{ {
struct page *page; struct page *page;
......
...@@ -250,7 +250,7 @@ struct clk_lookup_alloc { ...@@ -250,7 +250,7 @@ struct clk_lookup_alloc {
char con_id[MAX_CON_ID]; char con_id[MAX_CON_ID];
}; };
static struct clk_lookup * __init_refok static struct clk_lookup * __ref
vclkdev_alloc(struct clk_hw *hw, const char *con_id, const char *dev_fmt, vclkdev_alloc(struct clk_hw *hw, const char *con_id, const char *dev_fmt,
va_list ap) va_list ap)
{ {
...@@ -287,7 +287,7 @@ vclkdev_create(struct clk_hw *hw, const char *con_id, const char *dev_fmt, ...@@ -287,7 +287,7 @@ vclkdev_create(struct clk_hw *hw, const char *con_id, const char *dev_fmt,
return cl; return cl;
} }
struct clk_lookup * __init_refok struct clk_lookup * __ref
clkdev_alloc(struct clk *clk, const char *con_id, const char *dev_fmt, ...) clkdev_alloc(struct clk *clk, const char *con_id, const char *dev_fmt, ...)
{ {
struct clk_lookup *cl; struct clk_lookup *cl;
......
...@@ -1086,7 +1086,7 @@ static int pcifront_detach_devices(struct pcifront_device *pdev) ...@@ -1086,7 +1086,7 @@ static int pcifront_detach_devices(struct pcifront_device *pdev)
return err; return err;
} }
static void __init_refok pcifront_backend_changed(struct xenbus_device *xdev, static void __ref pcifront_backend_changed(struct xenbus_device *xdev,
enum xenbus_state be_state) enum xenbus_state be_state)
{ {
struct pcifront_device *pdev = dev_get_drvdata(&xdev->dev); struct pcifront_device *pdev = dev_get_drvdata(&xdev->dev);
......
...@@ -36,11 +36,11 @@ static int __init fb_logo_late_init(void) ...@@ -36,11 +36,11 @@ static int __init fb_logo_late_init(void)
late_initcall(fb_logo_late_init); late_initcall(fb_logo_late_init);
/* logo's are marked __initdata. Use __init_refok to tell /* logo's are marked __initdata. Use __ref to tell
* modpost that it is intended that this function uses data * modpost that it is intended that this function uses data
* marked __initdata. * marked __initdata.
*/ */
const struct linux_logo * __init_refok fb_find_logo(int depth) const struct linux_logo * __ref fb_find_logo(int depth)
{ {
const struct linux_logo *logo = NULL; const struct linux_logo *logo = NULL;
......
...@@ -13,7 +13,7 @@ static inline void __iomem *acpi_os_ioremap(acpi_physical_address phys, ...@@ -13,7 +13,7 @@ static inline void __iomem *acpi_os_ioremap(acpi_physical_address phys,
} }
#endif #endif
void __iomem *__init_refok void __iomem *__ref
acpi_os_map_iomem(acpi_physical_address phys, acpi_size size); acpi_os_map_iomem(acpi_physical_address phys, acpi_size size);
void __ref acpi_os_unmap_iomem(void __iomem *virt, acpi_size size); void __ref acpi_os_unmap_iomem(void __iomem *virt, acpi_size size);
void __iomem *acpi_os_get_iomem(acpi_physical_address phys, unsigned int size); void __iomem *acpi_os_get_iomem(acpi_physical_address phys, unsigned int size);
......
...@@ -77,12 +77,6 @@ ...@@ -77,12 +77,6 @@
#define __refdata __section(.ref.data) #define __refdata __section(.ref.data)
#define __refconst __constsection(.ref.rodata) #define __refconst __constsection(.ref.rodata)
/* compatibility defines */
#define __init_refok __ref
#define __initdata_refok __refdata
#define __exit_refok __ref
#ifdef MODULE #ifdef MODULE
#define __exitused #define __exitused
#else #else
......
...@@ -275,7 +275,7 @@ static inline struct net *read_pnet(const possible_net_t *pnet) ...@@ -275,7 +275,7 @@ static inline struct net *read_pnet(const possible_net_t *pnet)
#define __net_initconst #define __net_initconst
#else #else
#define __net_init __init #define __net_init __init
#define __net_exit __exit_refok #define __net_exit __ref
#define __net_initdata __initdata #define __net_initdata __initdata
#define __net_initconst __initconst #define __net_initconst __initconst
#endif #endif
......
...@@ -380,7 +380,7 @@ static void __init setup_command_line(char *command_line) ...@@ -380,7 +380,7 @@ static void __init setup_command_line(char *command_line)
static __initdata DECLARE_COMPLETION(kthreadd_done); static __initdata DECLARE_COMPLETION(kthreadd_done);
static noinline void __init_refok rest_init(void) static noinline void __ref rest_init(void)
{ {
int pid; int pid;
......
...@@ -5276,7 +5276,7 @@ void __init setup_per_cpu_pageset(void) ...@@ -5276,7 +5276,7 @@ void __init setup_per_cpu_pageset(void)
setup_zone_pageset(zone); setup_zone_pageset(zone);
} }
static noinline __init_refok static noinline __ref
int zone_wait_table_init(struct zone *zone, unsigned long zone_size_pages) int zone_wait_table_init(struct zone *zone, unsigned long zone_size_pages)
{ {
int i; int i;
...@@ -5903,7 +5903,7 @@ static void __paginginit free_area_init_core(struct pglist_data *pgdat) ...@@ -5903,7 +5903,7 @@ static void __paginginit free_area_init_core(struct pglist_data *pgdat)
} }
} }
static void __init_refok alloc_node_mem_map(struct pglist_data *pgdat)