powerpc: make of_device_ids const · tjh.dev/kernel@ce6d73c

tjh.dev / kernel

fork atom

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

fork atom

powerpc: make of_device_ids const

of_device_ids (i.e. compatible strings and the respective data) are not
supposed to change at runtime. All functions working with of_device_ids
provided by <linux/of.h> work with const of_device_ids. This allows to
mark all struct of_device_id const, too.

While touching these line also put the __init annotation at the right
position where necessary.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

authored by

Uwe Kleine-König and committed by

Michael Ellerman 11 years ago ce6d73c9 d4fe0965

+67 -67

58 changed files

expand all collapse all

arch

powerpc

kernel

ibmebus.c

legacy_serial.c

of_platform.c

platforms

40x

ep405.c

ppc40x_simple.c

virtex.c

walnut.c

44x

canyonlands.c

ebony.c

iss4xx.c

ppc44x_simple.c

ppc476.c

sam440ep.c

virtex.c

warp.c

512x

mpc512x_shared.c

52xx

lite5200.c

media5200.c

mpc52xx_common.c

mpc52xx_lpbfifo.c

mpc52xx_pic.c

82xx

ep8248e.c

km82xx.c

mpc8272_ads.c

pq2fads.c

83xx

mcu_mpc8349emitx.c

misc.c

mpc834x_itx.c

suspend.c

85xx

common.c

ppa8548.c

sgy_cts1000.c

86xx

gef_ppc9a.c

gef_sbc310.c

gef_sbc610.c

mpc8610_hpcd.c

mpc86xx_hpcn.c

sbc8641d.c

8xx

adder875.c

ep88xc.c

mpc86xads_setup.c

mpc885ads_setup.c

tqm8xx_setup.c

cell

celleb_pci.c

celleb_setup.c

embedded6xx

gamecube.c

linkstation.c

mvme5100.c

storcenter.c

wii.c

pasemi

gpio_mdio.c

setup.c

sysdev

axonram.c

fsl_85xx_l2ctlr.c

mv64x60_dev.c

pmi.c

xilinx_intc.c

xilinx_pci.c

+1 -1

arch/powerpc/kernel/ibmebus.c

reviewed

··· 55 55 struct bus_type ibmebus_bus_type; 56 56 57 57 /* These devices will automatically be added to the bus during init */ 58 58 - static struct of_device_id __initdata ibmebus_matches[] = { 58 58 + static const struct of_device_id ibmebus_matches[] __initconst = { 59 59 { .compatible = "IBM,lhca" }, 60 60 { .compatible = "IBM,lhea" }, 61 61 {},

+1 -1

arch/powerpc/kernel/legacy_serial.c

reviewed

··· 35 35 phys_addr_t taddr; 36 36 } legacy_serial_infos[MAX_LEGACY_SERIAL_PORTS]; 37 37 38 38 - static struct of_device_id legacy_serial_parents[] __initdata = { 38 38 + static const struct of_device_id legacy_serial_parents[] __initconst = { 39 39 {.type = "soc",}, 40 40 {.type = "tsi-bridge",}, 41 41 {.type = "opb", },

+1 -1

arch/powerpc/kernel/of_platform.c

reviewed

··· 97 97 return 0; 98 98 } 99 99 100 100 - static struct of_device_id of_pci_phb_ids[] = { 100 100 + static const struct of_device_id of_pci_phb_ids[] = { 101 101 { .type = "pci", }, 102 102 { .type = "pcix", }, 103 103 { .type = "pcie", },

+1 -1

arch/powerpc/platforms/40x/ep405.c

reviewed

··· 49 49 /* there's more, can't be bothered typing them tho */ 50 50 51 51 52 52 - static __initdata struct of_device_id ep405_of_bus[] = { 52 52 + static const struct of_device_id ep405_of_bus[] __initconst = { 53 53 { .compatible = "ibm,plb3", }, 54 54 { .compatible = "ibm,opb", }, 55 55 { .compatible = "ibm,ebc", },

+1 -1

arch/powerpc/platforms/40x/ppc40x_simple.c

reviewed

··· 24 24 #include <linux/init.h> 25 25 #include <linux/of_platform.h> 26 26 27 27 - static __initdata struct of_device_id ppc40x_of_bus[] = { 27 27 + static const struct of_device_id ppc40x_of_bus[] __initconst = { 28 28 { .compatible = "ibm,plb3", }, 29 29 { .compatible = "ibm,plb4", }, 30 30 { .compatible = "ibm,opb", },

+1 -1

arch/powerpc/platforms/40x/virtex.c

reviewed

··· 17 17 #include <asm/xilinx_pci.h> 18 18 #include <asm/ppc4xx.h> 19 19 20 20 - static struct of_device_id xilinx_of_bus_ids[] __initdata = { 20 20 + static const struct of_device_id xilinx_of_bus_ids[] __initconst = { 21 21 { .compatible = "xlnx,plb-v46-1.00.a", }, 22 22 { .compatible = "xlnx,plb-v34-1.01.a", }, 23 23 { .compatible = "xlnx,plb-v34-1.02.a", },

+1 -1

arch/powerpc/platforms/40x/walnut.c

reviewed

··· 28 28 #include <asm/pci-bridge.h> 29 29 #include <asm/ppc4xx.h> 30 30 31 31 - static __initdata struct of_device_id walnut_of_bus[] = { 31 31 + static const struct of_device_id walnut_of_bus[] __initconst = { 32 32 { .compatible = "ibm,plb3", }, 33 33 { .compatible = "ibm,opb", }, 34 34 { .compatible = "ibm,ebc", },

+1 -1

arch/powerpc/platforms/44x/canyonlands.c

reviewed

··· 33 33 34 34 #define BCSR_USB_EN 0x11 35 35 36 36 - static __initdata struct of_device_id ppc460ex_of_bus[] = { 36 36 + static const struct of_device_id ppc460ex_of_bus[] __initconst = { 37 37 { .compatible = "ibm,plb4", }, 38 38 { .compatible = "ibm,opb", }, 39 39 { .compatible = "ibm,ebc", },

+1 -1

arch/powerpc/platforms/44x/ebony.c

reviewed

··· 28 28 #include <asm/pci-bridge.h> 29 29 #include <asm/ppc4xx.h> 30 30 31 31 - static __initdata struct of_device_id ebony_of_bus[] = { 31 31 + static const struct of_device_id ebony_of_bus[] __initconst = { 32 32 { .compatible = "ibm,plb4", }, 33 33 { .compatible = "ibm,opb", }, 34 34 { .compatible = "ibm,ebc", },

+1 -1

arch/powerpc/platforms/44x/iss4xx.c

reviewed

··· 32 32 #include <asm/mpic.h> 33 33 #include <asm/mmu.h> 34 34 35 35 - static __initdata struct of_device_id iss4xx_of_bus[] = { 35 35 + static const struct of_device_id iss4xx_of_bus[] __initconst = { 36 36 { .compatible = "ibm,plb4", }, 37 37 { .compatible = "ibm,plb6", }, 38 38 { .compatible = "ibm,opb", },

+1 -1

arch/powerpc/platforms/44x/ppc44x_simple.c

reviewed

··· 24 24 #include <linux/init.h> 25 25 #include <linux/of_platform.h> 26 26 27 27 - static __initdata struct of_device_id ppc44x_of_bus[] = { 27 27 + static const struct of_device_id ppc44x_of_bus[] __initconst = { 28 28 { .compatible = "ibm,plb4", }, 29 29 { .compatible = "ibm,opb", }, 30 30 { .compatible = "ibm,ebc", },

+1 -1

arch/powerpc/platforms/44x/ppc476.c

reviewed

··· 38 38 #include <linux/pci.h> 39 39 #include <linux/i2c.h> 40 40 41 41 - static struct of_device_id ppc47x_of_bus[] __initdata = { 41 41 + static const struct of_device_id ppc47x_of_bus[] __initconst = { 42 42 { .compatible = "ibm,plb4", }, 43 43 { .compatible = "ibm,plb6", }, 44 44 { .compatible = "ibm,opb", },

+1 -1

arch/powerpc/platforms/44x/sam440ep.c

reviewed

··· 29 29 #include <asm/ppc4xx.h> 30 30 #include <linux/i2c.h> 31 31 32 32 - static __initdata struct of_device_id sam440ep_of_bus[] = { 32 32 + static const struct of_device_id sam440ep_of_bus[] __initconst = { 33 33 { .compatible = "ibm,plb4", }, 34 34 { .compatible = "ibm,opb", }, 35 35 { .compatible = "ibm,ebc", },

+1 -1

arch/powerpc/platforms/44x/virtex.c

reviewed

··· 21 21 #include <asm/ppc4xx.h> 22 22 #include "44x.h" 23 23 24 24 - static struct of_device_id xilinx_of_bus_ids[] __initdata = { 24 24 + static const struct of_device_id xilinx_of_bus_ids[] __initconst = { 25 25 { .compatible = "simple-bus", }, 26 26 { .compatible = "xlnx,plb-v46-1.00.a", }, 27 27 { .compatible = "xlnx,plb-v46-1.02.a", },

+1 -1

arch/powerpc/platforms/44x/warp.c

reviewed

··· 28 28 #include <asm/dma.h> 29 29 30 30 31 31 - static __initdata struct of_device_id warp_of_bus[] = { 31 31 + static const struct of_device_id warp_of_bus[] __initconst = { 32 32 { .compatible = "ibm,plb4", }, 33 33 { .compatible = "ibm,opb", }, 34 34 { .compatible = "ibm,ebc", },

+1 -1

arch/powerpc/platforms/512x/mpc512x_shared.c

reviewed

··· 337 337 /* 338 338 * Nodes to do bus probe on, soc and localbus 339 339 */ 340 340 - static struct of_device_id __initdata of_bus_ids[] = { 340 340 + static const struct of_device_id of_bus_ids[] __initconst = { 341 341 { .compatible = "fsl,mpc5121-immr", }, 342 342 { .compatible = "fsl,mpc5121-localbus", }, 343 343 { .compatible = "fsl,mpc5121-mbx", },

+2 -2

arch/powerpc/platforms/52xx/lite5200.c

reviewed

··· 34 34 */ 35 35 36 36 /* mpc5200 device tree match tables */ 37 37 - static struct of_device_id mpc5200_cdm_ids[] __initdata = { 37 37 + static const struct of_device_id mpc5200_cdm_ids[] __initconst = { 38 38 { .compatible = "fsl,mpc5200-cdm", }, 39 39 { .compatible = "mpc5200-cdm", }, 40 40 {} 41 41 }; 42 42 43 43 - static struct of_device_id mpc5200_gpio_ids[] __initdata = { 43 43 + static const struct of_device_id mpc5200_gpio_ids[] __initconst = { 44 44 { .compatible = "fsl,mpc5200-gpio", }, 45 45 { .compatible = "mpc5200-gpio", }, 46 46 {}

+1 -1

arch/powerpc/platforms/52xx/media5200.c

reviewed

··· 30 30 #include <asm/machdep.h> 31 31 #include <asm/mpc52xx.h> 32 32 33 33 - static struct of_device_id mpc5200_gpio_ids[] __initdata = { 33 33 + static const struct of_device_id mpc5200_gpio_ids[] __initconst = { 34 34 { .compatible = "fsl,mpc5200-gpio", }, 35 35 { .compatible = "mpc5200-gpio", }, 36 36 {}

+6 -6

arch/powerpc/platforms/52xx/mpc52xx_common.c

reviewed

··· 23 23 #include <asm/mpc52xx.h> 24 24 25 25 /* MPC5200 device tree match tables */ 26 26 - static struct of_device_id mpc52xx_xlb_ids[] __initdata = { 26 26 + static const struct of_device_id mpc52xx_xlb_ids[] __initconst = { 27 27 { .compatible = "fsl,mpc5200-xlb", }, 28 28 { .compatible = "mpc5200-xlb", }, 29 29 {} 30 30 }; 31 31 - static struct of_device_id mpc52xx_bus_ids[] __initdata = { 31 31 + static const struct of_device_id mpc52xx_bus_ids[] __initconst = { 32 32 { .compatible = "fsl,mpc5200-immr", }, 33 33 { .compatible = "fsl,mpc5200b-immr", }, 34 34 { .compatible = "simple-bus", }, ··· 108 108 /* 109 109 * match tables used by mpc52xx_map_common_devices() 110 110 */ 111 111 - static struct of_device_id mpc52xx_gpt_ids[] __initdata = { 111 111 + static const struct of_device_id mpc52xx_gpt_ids[] __initconst = { 112 112 { .compatible = "fsl,mpc5200-gpt", }, 113 113 { .compatible = "mpc5200-gpt", }, /* old */ 114 114 {} 115 115 }; 116 116 - static struct of_device_id mpc52xx_cdm_ids[] __initdata = { 116 116 + static const struct of_device_id mpc52xx_cdm_ids[] __initconst = { 117 117 { .compatible = "fsl,mpc5200-cdm", }, 118 118 { .compatible = "mpc5200-cdm", }, /* old */ 119 119 {} 120 120 }; 121 121 - static const struct of_device_id mpc52xx_gpio_simple[] = { 121 121 + static const struct of_device_id mpc52xx_gpio_simple[] __initconst = { 122 122 { .compatible = "fsl,mpc5200-gpio", }, 123 123 {} 124 124 }; 125 125 - static const struct of_device_id mpc52xx_gpio_wkup[] = { 125 125 + static const struct of_device_id mpc52xx_gpio_wkup[] __initconst = { 126 126 { .compatible = "fsl,mpc5200-gpio-wkup", }, 127 127 {} 128 128 };

+1 -1

arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c

reviewed

··· 564 564 return 0; 565 565 } 566 566 567 567 - static struct of_device_id mpc52xx_lpbfifo_match[] = { 567 567 + static const struct of_device_id mpc52xx_lpbfifo_match[] = { 568 568 { .compatible = "fsl,mpc5200-lpbfifo", }, 569 569 {}, 570 570 };

+2 -2

arch/powerpc/platforms/52xx/mpc52xx_pic.c

reviewed

··· 119 119 120 120 121 121 /* MPC5200 device tree match tables */ 122 122 - static struct of_device_id mpc52xx_pic_ids[] __initdata = { 122 122 + static const struct of_device_id mpc52xx_pic_ids[] __initconst = { 123 123 { .compatible = "fsl,mpc5200-pic", }, 124 124 { .compatible = "mpc5200-pic", }, 125 125 {} 126 126 }; 127 127 - static struct of_device_id mpc52xx_sdma_ids[] __initdata = { 127 127 + static const struct of_device_id mpc52xx_sdma_ids[] __initconst = { 128 128 { .compatible = "fsl,mpc5200-bestcomm", }, 129 129 { .compatible = "mpc5200-bestcomm", }, 130 130 {}

+1 -1

arch/powerpc/platforms/82xx/ep8248e.c

reviewed

··· 298 298 ppc_md.progress("ep8248e_setup_arch(), finish", 0); 299 299 } 300 300 301 301 - static __initdata struct of_device_id of_bus_ids[] = { 301 301 + static const struct of_device_id of_bus_ids[] __initconst = { 302 302 { .compatible = "simple-bus", }, 303 303 { .compatible = "fsl,ep8248e-bcsr", }, 304 304 {},

+1 -1

arch/powerpc/platforms/82xx/km82xx.c

reviewed

··· 180 180 ppc_md.progress("km82xx_setup_arch(), finish", 0); 181 181 } 182 182 183 183 - static __initdata struct of_device_id of_bus_ids[] = { 183 183 + static const struct of_device_id of_bus_ids[] __initconst = { 184 184 { .compatible = "simple-bus", }, 185 185 {}, 186 186 };

+1 -1

arch/powerpc/platforms/82xx/mpc8272_ads.c

reviewed

··· 181 181 ppc_md.progress("mpc8272_ads_setup_arch(), finish", 0); 182 182 } 183 183 184 184 - static struct of_device_id __initdata of_bus_ids[] = { 184 184 + static const struct of_device_id of_bus_ids[] __initconst = { 185 185 { .name = "soc", }, 186 186 { .name = "cpm", }, 187 187 { .name = "localbus", },

+1 -1

arch/powerpc/platforms/82xx/pq2fads.c

reviewed

··· 168 168 return of_flat_dt_is_compatible(root, "fsl,pq2fads"); 169 169 } 170 170 171 171 - static struct of_device_id __initdata of_bus_ids[] = { 171 171 + static const struct of_device_id of_bus_ids[] __initconst = { 172 172 { .name = "soc", }, 173 173 { .name = "cpm", }, 174 174 { .name = "localbus", },

+1 -1

arch/powerpc/platforms/83xx/mcu_mpc8349emitx.c

reviewed

··· 213 213 }; 214 214 MODULE_DEVICE_TABLE(i2c, mcu_ids); 215 215 216 216 - static struct of_device_id mcu_of_match_table[] = { 216 216 + static const struct of_device_id mcu_of_match_table[] = { 217 217 { .compatible = "fsl,mcu-mpc8349emitx", }, 218 218 { }, 219 219 };

+1 -1

arch/powerpc/platforms/83xx/misc.c

reviewed

··· 114 114 } 115 115 #endif /* CONFIG_QUICC_ENGINE */ 116 116 117 117 - static struct of_device_id __initdata of_bus_ids[] = { 117 117 + static const struct of_device_id of_bus_ids[] __initconst = { 118 118 { .type = "soc", }, 119 119 { .compatible = "soc", }, 120 120 { .compatible = "simple-bus" },

+1 -1

arch/powerpc/platforms/83xx/mpc834x_itx.c

reviewed

··· 38 38 39 39 #include "mpc83xx.h" 40 40 41 41 - static struct of_device_id __initdata mpc834x_itx_ids[] = { 41 41 + static const struct of_device_id mpc834x_itx_ids[] __initconst = { 42 42 { .compatible = "fsl,pq2pro-localbus", }, 43 43 {}, 44 44 };

+2 -2

arch/powerpc/platforms/83xx/suspend.c

reviewed

··· 321 321 .end = mpc83xx_suspend_end, 322 322 }; 323 323 324 324 - static struct of_device_id pmc_match[]; 324 324 + static const struct of_device_id pmc_match[]; 325 325 static int pmc_probe(struct platform_device *ofdev) 326 326 { 327 327 const struct of_device_id *match; ··· 420 420 } 421 421 }; 422 422 423 423 - static struct of_device_id pmc_match[] = { 423 423 + static const struct of_device_id pmc_match[] = { 424 424 { 425 425 .compatible = "fsl,mpc8313-pmc", 426 426 .data = &pmc_types[0],

+1 -1

arch/powerpc/platforms/85xx/common.c

reviewed

··· 14 14 15 15 #include "mpc85xx.h" 16 16 17 17 - static struct of_device_id __initdata mpc85xx_common_ids[] = { 17 17 + static const struct of_device_id mpc85xx_common_ids[] __initconst = { 18 18 { .type = "soc", }, 19 19 { .compatible = "soc", }, 20 20 { .compatible = "simple-bus", },

+1 -1

arch/powerpc/platforms/85xx/ppa8548.c

reviewed

··· 59 59 seq_printf(m, "PLL setting\t: 0x%x\n", ((phid1 >> 24) & 0x3f)); 60 60 } 61 61 62 62 - static struct of_device_id __initdata of_bus_ids[] = { 62 62 + static const struct of_device_id of_bus_ids[] __initconst = { 63 63 { .name = "soc", }, 64 64 { .type = "soc", }, 65 65 { .compatible = "simple-bus", },

+2 -2

arch/powerpc/platforms/85xx/sgy_cts1000.c

reviewed

··· 24 24 25 25 static struct device_node *halt_node; 26 26 27 27 - static struct of_device_id child_match[] = { 27 27 + static const struct of_device_id child_match[] = { 28 28 { 29 29 .compatible = "sgy,gpio-halt", 30 30 }, ··· 147 147 return 0; 148 148 } 149 149 150 150 - static struct of_device_id gpio_halt_match[] = { 150 150 + static const struct of_device_id gpio_halt_match[] = { 151 151 /* We match on the gpio bus itself and scan the children since they 152 152 * wont be matched against us. We know the bus wont match until it 153 153 * has been registered too. */

+1 -1

arch/powerpc/platforms/86xx/gef_ppc9a.c

reviewed

··· 213 213 return 0; 214 214 } 215 215 216 216 - static __initdata struct of_device_id of_bus_ids[] = { 216 216 + static const struct of_device_id of_bus_ids[] __initconst = { 217 217 { .compatible = "simple-bus", }, 218 218 { .compatible = "gianfar", }, 219 219 { .compatible = "fsl,mpc8641-pcie", },

+1 -1

arch/powerpc/platforms/86xx/gef_sbc310.c

reviewed

··· 200 200 return 0; 201 201 } 202 202 203 203 - static __initdata struct of_device_id of_bus_ids[] = { 203 203 + static const struct of_device_id of_bus_ids[] __initconst = { 204 204 { .compatible = "simple-bus", }, 205 205 { .compatible = "gianfar", }, 206 206 { .compatible = "fsl,mpc8641-pcie", },

+1 -1

arch/powerpc/platforms/86xx/gef_sbc610.c

reviewed

··· 190 190 return 0; 191 191 } 192 192 193 193 - static __initdata struct of_device_id of_bus_ids[] = { 193 193 + static const struct of_device_id of_bus_ids[] __initconst = { 194 194 { .compatible = "simple-bus", }, 195 195 { .compatible = "gianfar", }, 196 196 { .compatible = "fsl,mpc8641-pcie", },

+1 -1

arch/powerpc/platforms/86xx/mpc8610_hpcd.c

reviewed

··· 85 85 static inline void mpc8610_suspend_init(void) { } 86 86 #endif /* CONFIG_SUSPEND */ 87 87 88 88 - static struct of_device_id __initdata mpc8610_ids[] = { 88 88 + static const struct of_device_id mpc8610_ids[] __initconst = { 89 89 { .compatible = "fsl,mpc8610-immr", }, 90 90 { .compatible = "fsl,mpc8610-guts", }, 91 91 { .compatible = "simple-bus", },

+1 -1

arch/powerpc/platforms/86xx/mpc86xx_hpcn.c

reviewed

··· 127 127 return 0; 128 128 } 129 129 130 130 - static __initdata struct of_device_id of_bus_ids[] = { 130 130 + static const struct of_device_id of_bus_ids[] __initconst = { 131 131 { .compatible = "simple-bus", }, 132 132 { .compatible = "fsl,srio", }, 133 133 { .compatible = "gianfar", },

+1 -1

arch/powerpc/platforms/86xx/sbc8641d.c

reviewed

··· 92 92 return 0; 93 93 } 94 94 95 95 - static __initdata struct of_device_id of_bus_ids[] = { 95 95 + static const struct of_device_id of_bus_ids[] __initconst = { 96 96 { .compatible = "simple-bus", }, 97 97 { .compatible = "gianfar", }, 98 98 { .compatible = "fsl,mpc8641-pcie", },

+1 -1

arch/powerpc/platforms/8xx/adder875.c

reviewed

··· 92 92 return of_flat_dt_is_compatible(root, "analogue-and-micro,adder875"); 93 93 } 94 94 95 95 - static __initdata struct of_device_id of_bus_ids[] = { 95 95 + static const struct of_device_id of_bus_ids[] __initconst = { 96 96 { .compatible = "simple-bus", }, 97 97 {}, 98 98 };

+1 -1

arch/powerpc/platforms/8xx/ep88xc.c

reviewed

··· 147 147 return of_flat_dt_is_compatible(root, "fsl,ep88xc"); 148 148 } 149 149 150 150 - static struct of_device_id __initdata of_bus_ids[] = { 150 150 + static const struct of_device_id of_bus_ids[] __initconst = { 151 151 { .name = "soc", }, 152 152 { .name = "cpm", }, 153 153 { .name = "localbus", },

+1 -1

arch/powerpc/platforms/8xx/mpc86xads_setup.c

reviewed

··· 122 122 return of_flat_dt_is_compatible(root, "fsl,mpc866ads"); 123 123 } 124 124 125 125 - static struct of_device_id __initdata of_bus_ids[] = { 125 125 + static const struct of_device_id of_bus_ids[] __initconst = { 126 126 { .name = "soc", }, 127 127 { .name = "cpm", }, 128 128 { .name = "localbus", },

+1 -1

arch/powerpc/platforms/8xx/mpc885ads_setup.c

reviewed

··· 197 197 return of_flat_dt_is_compatible(root, "fsl,mpc885ads"); 198 198 } 199 199 200 200 - static struct of_device_id __initdata of_bus_ids[] = { 200 200 + static const struct of_device_id of_bus_ids[] __initconst = { 201 201 { .name = "soc", }, 202 202 { .name = "cpm", }, 203 203 { .name = "localbus", },

+1 -1

arch/powerpc/platforms/8xx/tqm8xx_setup.c

reviewed

··· 124 124 return of_flat_dt_is_compatible(node, "tqc,tqm8xx"); 125 125 } 126 126 127 127 - static struct of_device_id __initdata of_bus_ids[] = { 127 127 + static const struct of_device_id of_bus_ids[] __initconst = { 128 128 { .name = "soc", }, 129 129 { .name = "cpm", }, 130 130 { .name = "localbus", },

+1 -1

arch/powerpc/platforms/cell/celleb_pci.c

reviewed

··· 454 454 .setup = celleb_setup_fake_pci, 455 455 }; 456 456 457 457 - static struct of_device_id celleb_phb_match[] __initdata = { 457 457 + static const struct of_device_id celleb_phb_match[] __initconst = { 458 458 { 459 459 .name = "pci-pseudo", 460 460 .data = &celleb_fake_pci_spec,

+1 -1

arch/powerpc/platforms/cell/celleb_setup.c

reviewed

··· 102 102 #endif 103 103 } 104 104 105 105 - static struct of_device_id celleb_bus_ids[] __initdata = { 105 105 + static const struct of_device_id celleb_bus_ids[] __initconst = { 106 106 { .type = "scc", }, 107 107 { .type = "ioif", }, /* old style */ 108 108 {},

+1 -1

arch/powerpc/platforms/embedded6xx/gamecube.c

reviewed

··· 90 90 }; 91 91 92 92 93 93 - static struct of_device_id gamecube_of_bus[] = { 93 93 + static const struct of_device_id gamecube_of_bus[] = { 94 94 { .compatible = "nintendo,flipper", }, 95 95 { }, 96 96 };

+1 -1

arch/powerpc/platforms/embedded6xx/linkstation.c

reviewed

··· 21 21 22 22 #include "mpc10x.h" 23 23 24 24 - static __initdata struct of_device_id of_bus_ids[] = { 24 24 + static const struct of_device_id of_bus_ids[] __initconst = { 25 25 { .type = "soc", }, 26 26 { .compatible = "simple-bus", }, 27 27 {},

+1 -1

arch/powerpc/platforms/embedded6xx/mvme5100.c

reviewed

··· 149 149 return 0; 150 150 } 151 151 152 152 - static struct of_device_id mvme5100_of_bus_ids[] __initdata = { 152 152 + static const struct of_device_id mvme5100_of_bus_ids[] __initconst = { 153 153 { .compatible = "hawk-bridge", }, 154 154 {}, 155 155 };

+1 -1

arch/powerpc/platforms/embedded6xx/storcenter.c

reviewed

··· 24 24 #include "mpc10x.h" 25 25 26 26 27 27 - static __initdata struct of_device_id storcenter_of_bus[] = { 27 27 + static const struct of_device_id storcenter_of_bus[] __initconst = { 28 28 { .name = "soc", }, 29 29 {}, 30 30 };

+1 -1

arch/powerpc/platforms/embedded6xx/wii.c

reviewed

··· 235 235 .machine_shutdown = wii_shutdown, 236 236 }; 237 237 238 238 - static struct of_device_id wii_of_bus[] = { 238 238 + static const struct of_device_id wii_of_bus[] = { 239 239 { .compatible = "nintendo,hollywood", }, 240 240 { }, 241 241 };

+1 -1

arch/powerpc/platforms/pasemi/gpio_mdio.c

reviewed

··· 290 290 return 0; 291 291 } 292 292 293 293 - static struct of_device_id gpio_mdio_match[] = 293 293 + static const struct of_device_id gpio_mdio_match[] = 294 294 { 295 295 { 296 296 .compatible = "gpio-mdio",

+1 -1

arch/powerpc/platforms/pasemi/setup.c

reviewed

··· 393 393 #endif 394 394 395 395 396 396 - static struct of_device_id pasemi_bus_ids[] = { 396 396 + static const struct of_device_id pasemi_bus_ids[] = { 397 397 /* Unfortunately needed for legacy firmwares */ 398 398 { .type = "localbus", }, 399 399 { .type = "sdc", },

+1 -1

arch/powerpc/sysdev/axonram.c

reviewed

··· 314 314 return 0; 315 315 } 316 316 317 317 - static struct of_device_id axon_ram_device_id[] = { 317 317 + static const struct of_device_id axon_ram_device_id[] = { 318 318 { 319 319 .type = "dma-memory" 320 320 },

+1 -1

arch/powerpc/sysdev/fsl_85xx_l2ctlr.c

reviewed

··· 171 171 return 0; 172 172 } 173 173 174 174 - static struct of_device_id mpc85xx_l2ctlr_of_match[] = { 174 174 + static const struct of_device_id mpc85xx_l2ctlr_of_match[] = { 175 175 { 176 176 .compatible = "fsl,p2020-l2-cache-controller", 177 177 },

+1 -1

arch/powerpc/sysdev/mv64x60_dev.c

reviewed

··· 23 23 24 24 /* These functions provide the necessary setup for the mv64x60 drivers. */ 25 25 26 26 - static struct of_device_id __initdata of_mv64x60_devices[] = { 26 26 + static const struct of_device_id of_mv64x60_devices[] __initconst = { 27 27 { .compatible = "marvell,mv64306-devctrl", }, 28 28 {} 29 29 };

+1 -1

arch/powerpc/sysdev/pmi.c

reviewed

··· 101 101 } 102 102 103 103 104 104 - static struct of_device_id pmi_match[] = { 104 104 + static const struct of_device_id pmi_match[] = { 105 105 { .type = "ibm,pmi", .name = "ibm,pmi" }, 106 106 { .type = "ibm,pmi" }, 107 107 {},

+1 -1

arch/powerpc/sysdev/xilinx_intc.c

reviewed

··· 265 265 static inline void xilinx_i8259_setup_cascade(void) { return; } 266 266 #endif /* defined(CONFIG_PPC_I8259) */ 267 267 268 268 - static struct of_device_id xilinx_intc_match[] __initconst = { 268 268 + static const struct of_device_id xilinx_intc_match[] __initconst = { 269 269 { .compatible = "xlnx,opb-intc-1.00.c", }, 270 270 { .compatible = "xlnx,xps-intc-1.00.a", }, 271 271 {}

+1 -1

arch/powerpc/sysdev/xilinx_pci.c

reviewed

··· 27 27 28 28 #define PCI_HOST_ENABLE_CMD PCI_COMMAND_SERR | PCI_COMMAND_PARITY | PCI_COMMAND_MASTER | PCI_COMMAND_MEMORY 29 29 30 30 - static struct of_device_id xilinx_pci_match[] = { 30 30 + static const struct of_device_id xilinx_pci_match[] = { 31 31 { .compatible = "xlnx,plbv46-pci-1.03.a", }, 32 32 {} 33 33 };