aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sh
diff options
context:
space:
mode:
authorFabian Frederick <fabf@skynet.be>2016-08-02 17:03:33 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2016-08-02 17:31:41 -0400
commitbd721ea73e1f965569b40620538c942001f76294 (patch)
tree08fd008f4530e3bddcca019bd5ae6fb74d713fa5 /arch/sh
parentca945e71529c69f71b773b31f03a681876872117 (diff)
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 312b1485fb50 ("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>
Diffstat (limited to 'arch/sh')
-rw-r--r--arch/sh/drivers/pci/pci.c4
-rw-r--r--arch/sh/mm/ioremap.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/sh/drivers/pci/pci.c b/arch/sh/drivers/pci/pci.c
index d5462b7bc514..84563e39a5b8 100644
--- a/arch/sh/drivers/pci/pci.c
+++ b/arch/sh/drivers/pci/pci.c
@@ -221,7 +221,7 @@ pcibios_bus_report_status_early(struct pci_channel *hose,
221 * We can't use pci_find_device() here since we are 221 * We can't use pci_find_device() here since we are
222 * called from interrupt context. 222 * called from interrupt context.
223 */ 223 */
224static void __init_refok 224static void __ref
225pcibios_bus_report_status(struct pci_bus *bus, unsigned int status_mask, 225pcibios_bus_report_status(struct pci_bus *bus, unsigned int status_mask,
226 int warn) 226 int warn)
227{ 227{
@@ -256,7 +256,7 @@ pcibios_bus_report_status(struct pci_bus *bus, unsigned int status_mask,
256 pcibios_bus_report_status(dev->subordinate, status_mask, warn); 256 pcibios_bus_report_status(dev->subordinate, status_mask, warn);
257} 257}
258 258
259void __init_refok pcibios_report_status(unsigned int status_mask, int warn) 259void __ref pcibios_report_status(unsigned int status_mask, int warn)
260{ 260{
261 struct pci_channel *hose; 261 struct pci_channel *hose;
262 262
diff --git a/arch/sh/mm/ioremap.c b/arch/sh/mm/ioremap.c
index 0c99ec2e7ed8..d09ddfe58fd8 100644
--- a/arch/sh/mm/ioremap.c
+++ b/arch/sh/mm/ioremap.c
@@ -34,7 +34,7 @@
34 * have to convert them into an offset in a page-aligned mapping, but the 34 * have to convert them into an offset in a page-aligned mapping, but the
35 * caller shouldn't need to know that small detail. 35 * caller shouldn't need to know that small detail.
36 */ 36 */
37void __iomem * __init_refok 37void __iomem * __ref
38__ioremap_caller(phys_addr_t phys_addr, unsigned long size, 38__ioremap_caller(phys_addr_t phys_addr, unsigned long size,
39 pgprot_t pgprot, void *caller) 39 pgprot_t pgprot, void *caller)
40{ 40{