Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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.be


Signed-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

arch/alpha/kernel/machvec_impl.h

+1 −1
Original line number Diff line number Diff line
@@ -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

arch/arc/mm/init.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

}

arch/arm/mach-integrator/impd1.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

arch/arm/mach-mv78xx0/common.c

+1 −1
Original line number Diff line number Diff line
@@ -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());

arch/blackfin/mm/init.c

+1 −1
Original line number Diff line number Diff line
@@ -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);