You've already forked linux-rockchip
mirror of
https://github.com/armbian/linux-rockchip.git
synced 2026-01-06 11:08:10 -08:00
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 312b1485fb ("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.be
Signed-off-by: Fabian Frederick <fabf@skynet.be>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
committed by
Linus Torvalds
parent
ca945e7152
commit
bd721ea73e
@@ -137,7 +137,7 @@
|
||||
#define __initmv __initdata
|
||||
#define ALIAS_MV(x)
|
||||
#else
|
||||
#define __initmv __initdata_refok
|
||||
#define __initmv __refdata
|
||||
|
||||
/* GCC actually has a syntax for defining aliases, but is under some
|
||||
delusion that you shouldn't be able to declare it extern somewhere
|
||||
|
||||
@@ -220,7 +220,7 @@ void __init mem_init(void)
|
||||
/*
|
||||
* free_initmem: Free all the __init memory.
|
||||
*/
|
||||
void __init_refok free_initmem(void)
|
||||
void __ref free_initmem(void)
|
||||
{
|
||||
free_initmem_default(-1);
|
||||
}
|
||||
|
||||
@@ -320,11 +320,11 @@ static struct impd1_device impd1_devs[] = {
|
||||
#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
|
||||
* 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;
|
||||
int irq_base;
|
||||
|
||||
@@ -343,7 +343,7 @@ void __init mv78xx0_init_early(void)
|
||||
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,
|
||||
IRQ_MV78XX0_TIMER_1, get_tclk());
|
||||
|
||||
@@ -112,7 +112,7 @@ void __init free_initrd_mem(unsigned long start, unsigned long end)
|
||||
}
|
||||
#endif
|
||||
|
||||
void __init_refok free_initmem(void)
|
||||
void __ref free_initmem(void)
|
||||
{
|
||||
#if defined CONFIG_RAMKERNEL && !defined CONFIG_MPU
|
||||
free_initmem_default(-1);
|
||||
|
||||
@@ -93,7 +93,7 @@ void __init mem_init(void)
|
||||
* Todo: free pages between __init_begin and __init_end; possibly
|
||||
* 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,
|
||||
}
|
||||
|
||||
/* 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),
|
||||
KERNEL_STACK_SIZE, 0);
|
||||
|
||||
@@ -414,7 +414,7 @@ void __init *early_get_page(void)
|
||||
|
||||
#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)
|
||||
return kmalloc(size, mask);
|
||||
@@ -422,7 +422,7 @@ void * __init_refok alloc_maybe_bootmem(size_t size, gfp_t mask)
|
||||
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;
|
||||
|
||||
|
||||
@@ -234,7 +234,7 @@ unsigned long iopa(unsigned long addr)
|
||||
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)
|
||||
{
|
||||
pte_t *pte;
|
||||
|
||||
@@ -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 __init_refok free_initmem(void)
|
||||
void __ref free_initmem(void)
|
||||
{
|
||||
prom_free_prom_memory();
|
||||
/*
|
||||
|
||||
@@ -268,7 +268,7 @@ static int txx9_i8259_irq_setup(int irq)
|
||||
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 */
|
||||
u8 reg_64;
|
||||
|
||||
@@ -89,7 +89,7 @@ void __init free_initrd_mem(unsigned long start, unsigned long end)
|
||||
}
|
||||
#endif
|
||||
|
||||
void __init_refok free_initmem(void)
|
||||
void __ref free_initmem(void)
|
||||
{
|
||||
free_initmem_default(-1);
|
||||
}
|
||||
|
||||
@@ -38,7 +38,7 @@ static unsigned int fixmaps_used __initdata;
|
||||
* have to convert them into an offset in a page-aligned mapping, but the
|
||||
* 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)
|
||||
{
|
||||
phys_addr_t p;
|
||||
@@ -116,7 +116,7 @@ void iounmap(void *addr)
|
||||
* 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)
|
||||
{
|
||||
pte_t *pte;
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
#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;
|
||||
|
||||
|
||||
@@ -79,7 +79,7 @@ void pgd_free(struct mm_struct *mm, pgd_t *pgd)
|
||||
#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;
|
||||
|
||||
|
||||
@@ -353,12 +353,12 @@ static int pmac_late_init(void)
|
||||
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"
|
||||
* will be false after __init time. This can't be __init because it
|
||||
* 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;
|
||||
|
||||
|
||||
@@ -189,7 +189,7 @@ fail_malloc:
|
||||
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,
|
||||
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)
|
||||
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)
|
||||
{
|
||||
int size;
|
||||
|
||||
@@ -91,7 +91,7 @@ void free_initrd_mem(unsigned long start, unsigned long end)
|
||||
}
|
||||
#endif
|
||||
|
||||
void __init_refok free_initmem(void)
|
||||
void __ref free_initmem(void)
|
||||
{
|
||||
free_initmem_default(POISON_FREE_INITMEM);
|
||||
}
|
||||
|
||||
@@ -221,7 +221,7 @@ pcibios_bus_report_status_early(struct pci_channel *hose,
|
||||
* We can't use pci_find_device() here since we are
|
||||
* called from interrupt context.
|
||||
*/
|
||||
static void __init_refok
|
||||
static void __ref
|
||||
pcibios_bus_report_status(struct pci_bus *bus, unsigned int status_mask,
|
||||
int warn)
|
||||
{
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
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;
|
||||
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user