sh/PCI: Remove __init optimisations from IRQ mapping functions/data

Matthew Minter · bjorn-helgaas · commit 2b8ff9f27691 · 2017-08-03T16:21:31.000-05:00
Currently many IRQ mapping functions and data structures use the __init and
__initdata optimisations. These result in the relevant functions being
innaccessible after boot time.

However for deferred IRQ assignment it is important to have access to these
functions at PCI device enable time.

Therefore, remove the optimisation from the relevant data structures and
functions to prepare for deferred IRQ assignment.

Signed-off-by: Matthew Minter &lt;matt@masarand.com&gt;
Signed-off-by: Bjorn Helgaas &lt;bhelgaas@google.com&gt;
Cc: Rich Felker &lt;dalias@libc.org&gt;
Cc: Yoshinori Sato &lt;ysato@users.sourceforge.jp&gt;
diff --git a/arch/sh/drivers/pci/fixups-cayman.c b/arch/sh/drivers/pci/fixups-cayman.c
@@ -5,7 +5,7 @@
 #include <cpu/irq.h>
 #include "pci-sh5.h"
 
-int __init pcibios_map_platform_irq(const struct pci_dev *dev, u8 slot, u8 pin)
+int pcibios_map_platform_irq(const struct pci_dev *dev, u8 slot, u8 pin)
 {
 	int result = -1;
 
diff --git a/arch/sh/drivers/pci/fixups-dreamcast.c b/arch/sh/drivers/pci/fixups-dreamcast.c
@@ -76,7 +76,7 @@ static void gapspci_fixup_resources(struct pci_dev *dev)
 }
 DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, gapspci_fixup_resources);
 
-int __init pcibios_map_platform_irq(const struct pci_dev *dev, u8 slot, u8 pin)
+int pcibios_map_platform_irq(const struct pci_dev *dev, u8 slot, u8 pin)
 {
 	/*
 	 * The interrupt routing semantics here are quite trivial.
diff --git a/arch/sh/drivers/pci/fixups-r7780rp.c b/arch/sh/drivers/pci/fixups-r7780rp.c
@@ -15,7 +15,7 @@
 #include <linux/sh_intc.h>
 #include "pci-sh4.h"
 
-int __init pcibios_map_platform_irq(const struct pci_dev *pdev, u8 slot, u8 pin)
+int pcibios_map_platform_irq(const struct pci_dev *pdev, u8 slot, u8 pin)
 {
 	return evt2irq(0xa20) + slot;
 }
diff --git a/arch/sh/drivers/pci/fixups-rts7751r2d.c b/arch/sh/drivers/pci/fixups-rts7751r2d.c
@@ -20,18 +20,18 @@
 #define PCIMCR_MRSET_OFF	0xBFFFFFFF
 #define PCIMCR_RFSH_OFF		0xFFFFFFFB
 
-static u8 rts7751r2d_irq_tab[] __initdata = {
+static u8 rts7751r2d_irq_tab[] = {
 	IRQ_PCI_INTA,
 	IRQ_PCI_INTB,
 	IRQ_PCI_INTC,
 	IRQ_PCI_INTD,
 };
 
-static char lboxre2_irq_tab[] __initdata = {
+static char lboxre2_irq_tab[] = {
 	IRQ_ETH0, IRQ_ETH1, IRQ_INTA, IRQ_INTD,
 };
 
-int __init pcibios_map_platform_irq(const struct pci_dev *pdev, u8 slot, u8 pin)
+int pcibios_map_platform_irq(const struct pci_dev *pdev, u8 slot, u8 pin)
 {
 	if (mach_is_lboxre2())
 		return lboxre2_irq_tab[slot];
diff --git a/arch/sh/drivers/pci/fixups-sdk7780.c b/arch/sh/drivers/pci/fixups-sdk7780.c
@@ -22,7 +22,7 @@
 #define IRQ_INTD	evt2irq(0xa80)
 
 /* IDSEL [16][17][18][19][20][21][22][23][24][25][26][27][28][29][30][31] */
-static char sdk7780_irq_tab[4][16] __initdata = {
+static char sdk7780_irq_tab[4][16] = {
 	/* INTA */
 	{ IRQ_INTA, IRQ_INTD, IRQ_INTC, IRQ_INTD, -1, -1, -1, -1, -1, -1,
 	  -1, -1, -1, -1, -1, -1 },
@@ -37,7 +37,7 @@ static char sdk7780_irq_tab[4][16] __initdata = {
 	  -1, -1, -1 },
 };
 
-int __init pcibios_map_platform_irq(const struct pci_dev *pdev, u8 slot, u8 pin)
+int pcibios_map_platform_irq(const struct pci_dev *pdev, u8 slot, u8 pin)
 {
        return sdk7780_irq_tab[pin-1][slot];
 }
diff --git a/arch/sh/drivers/pci/fixups-se7751.c b/arch/sh/drivers/pci/fixups-se7751.c
@@ -7,7 +7,7 @@
 #include <linux/sh_intc.h>
 #include "pci-sh4.h"
 
-int __init pcibios_map_platform_irq(const struct pci_dev *, u8 slot, u8 pin)
+int pcibios_map_platform_irq(const struct pci_dev *, u8 slot, u8 pin)
 {
         switch (slot) {
         case 0: return evt2irq(0x3a0);
diff --git a/arch/sh/drivers/pci/fixups-sh03.c b/arch/sh/drivers/pci/fixups-sh03.c
@@ -4,7 +4,7 @@
 #include <linux/pci.h>
 #include <linux/sh_intc.h>
 
-int __init pcibios_map_platform_irq(const struct pci_dev *dev, u8 slot, u8 pin)
+int pcibios_map_platform_irq(const struct pci_dev *dev, u8 slot, u8 pin)
 {
 	int irq;
 
diff --git a/arch/sh/drivers/pci/fixups-snapgear.c b/arch/sh/drivers/pci/fixups-snapgear.c
@@ -19,7 +19,7 @@
 #include <linux/sh_intc.h>
 #include "pci-sh4.h"
 
-int __init pcibios_map_platform_irq(const struct pci_dev *pdev, u8 slot, u8 pin)
+int pcibios_map_platform_irq(const struct pci_dev *pdev, u8 slot, u8 pin)
 {
 	int irq = -1;
 
diff --git a/arch/sh/drivers/pci/fixups-titan.c b/arch/sh/drivers/pci/fixups-titan.c
@@ -19,15 +19,15 @@
 #include <mach/titan.h>
 #include "pci-sh4.h"
 
-static char titan_irq_tab[] __initdata = {
+static char titan_irq_tab[] = {
 	TITAN_IRQ_WAN,
 	TITAN_IRQ_LAN,
 	TITAN_IRQ_MPCIA,
 	TITAN_IRQ_MPCIB,
 	TITAN_IRQ_USB,
 };
 
-int __init pcibios_map_platform_irq(const struct pci_dev *pdev, u8 slot, u8 pin)
+int pcibios_map_platform_irq(const struct pci_dev *pdev, u8 slot, u8 pin)
 {
 	int irq = titan_irq_tab[slot];
 
diff --git a/arch/sh/drivers/pci/pcie-sh7786.c b/arch/sh/drivers/pci/pcie-sh7786.c
@@ -467,7 +467,7 @@ static int __init pcie_init(struct sh7786_pcie_port *port)
 	return 0;
 }
 
-int __init pcibios_map_platform_irq(const struct pci_dev *pdev, u8 slot, u8 pin)
+int pcibios_map_platform_irq(const struct pci_dev *pdev, u8 slot, u8 pin)
 {
         return evt2irq(0xae0);
 }

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`#include <cpu/irq.h>`
`6`	`6`	`#include "pci-sh5.h"`
`7`	`7`
`8`		`-int __init pcibios_map_platform_irq(const struct pci_dev *dev, u8 slot, u8 pin)`
	`8`	`+int pcibios_map_platform_irq(const struct pci_dev *dev, u8 slot, u8 pin)`
`9`	`9`	`{`
`10`	`10`	`int result = -1;`
`11`	`11`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ static void gapspci_fixup_resources(struct pci_dev *dev)`
`76`	`76`	`}`
`77`	`77`	`DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, gapspci_fixup_resources);`
`78`	`78`
`79`		`-int __init pcibios_map_platform_irq(const struct pci_dev *dev, u8 slot, u8 pin)`
	`79`	`+int pcibios_map_platform_irq(const struct pci_dev *dev, u8 slot, u8 pin)`
`80`	`80`	`{`
`81`	`81`	`/*`
`82`	`82`	`* The interrupt routing semantics here are quite trivial.`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`#include <linux/sh_intc.h>`
`16`	`16`	`#include "pci-sh4.h"`
`17`	`17`
`18`		`-int __init pcibios_map_platform_irq(const struct pci_dev *pdev, u8 slot, u8 pin)`
	`18`	`+int pcibios_map_platform_irq(const struct pci_dev *pdev, u8 slot, u8 pin)`
`19`	`19`	`{`
`20`	`20`	`return evt2irq(0xa20) + slot;`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`#include <linux/sh_intc.h>`
`8`	`8`	`#include "pci-sh4.h"`
`9`	`9`
`10`		`-int __init pcibios_map_platform_irq(const struct pci_dev *, u8 slot, u8 pin)`
	`10`	`+int pcibios_map_platform_irq(const struct pci_dev *, u8 slot, u8 pin)`
`11`	`11`	`{`
`12`	`12`	`switch (slot) {`
`13`	`13`	`case 0: return evt2irq(0x3a0);`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`#include <linux/pci.h>`
`5`	`5`	`#include <linux/sh_intc.h>`
`6`	`6`
`7`		`-int __init pcibios_map_platform_irq(const struct pci_dev *dev, u8 slot, u8 pin)`
	`7`	`+int pcibios_map_platform_irq(const struct pci_dev *dev, u8 slot, u8 pin)`
`8`	`8`	`{`
`9`	`9`	`int irq;`
`10`	`10`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`	`#include <linux/sh_intc.h>`
`20`	`20`	`#include "pci-sh4.h"`
`21`	`21`
`22`		`-int __init pcibios_map_platform_irq(const struct pci_dev *pdev, u8 slot, u8 pin)`
	`22`	`+int pcibios_map_platform_irq(const struct pci_dev *pdev, u8 slot, u8 pin)`
`23`	`23`	`{`
`24`	`24`	`int irq = -1;`
`25`	`25`
Original file line number	Diff line number	Diff line change
`@@ -467,7 +467,7 @@ static int __init pcie_init(struct sh7786_pcie_port *port)`
`467`	`467`	`return 0;`
`468`	`468`	`}`
`469`	`469`
`470`		`-int __init pcibios_map_platform_irq(const struct pci_dev *pdev, u8 slot, u8 pin)`
	`470`	`+int pcibios_map_platform_irq(const struct pci_dev *pdev, u8 slot, u8 pin)`
`471`	`471`	`{`
`472`	`472`	`return evt2irq(0xae0);`
`473`	`473`	`}`