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

sparc: Annotate of_device_id arrays with const or __initdata.

As suggested by Stephen Rothwell.

Signed-off-by: David S. Miller <davem@davemloft.net>

+53 -53
+1 -1
arch/sparc/include/asm/parport.h
··· 215 215 return 0; 216 216 } 217 217 218 - static struct of_device_id ecpp_match[] = { 218 + static const struct of_device_id ecpp_match[] = { 219 219 { 220 220 .name = "ecpp", 221 221 },
+1 -1
arch/sparc/kernel/apc.c
··· 182 182 return 0; 183 183 } 184 184 185 - static struct of_device_id apc_match[] = { 185 + static struct of_device_id __initdata apc_match[] = { 186 186 { 187 187 .name = APC_OBPNAME, 188 188 },
+1 -1
arch/sparc/kernel/pmc.c
··· 72 72 return 0; 73 73 } 74 74 75 - static struct of_device_id pmc_match[] = { 75 + static struct of_device_id __initdata pmc_match[] = { 76 76 { 77 77 .name = PMC_OBPNAME, 78 78 },
+1 -1
arch/sparc/kernel/time.c
··· 338 338 return 0; 339 339 } 340 340 341 - static struct of_device_id clock_match[] = { 341 + static struct of_device_id __initdata clock_match[] = { 342 342 { 343 343 .name = "eeprom", 344 344 },
+1 -1
arch/sparc64/kernel/auxio.c
··· 109 109 } 110 110 } 111 111 112 - static struct of_device_id auxio_match[] = { 112 + static struct of_device_id __initdata auxio_match[] = { 113 113 { 114 114 .name = "auxio", 115 115 },
+1 -1
arch/sparc64/kernel/chmc.c
··· 801 801 return 0; 802 802 } 803 803 804 - static struct of_device_id us3mc_match[] = { 804 + static const struct of_device_id us3mc_match[] = { 805 805 { 806 806 .name = "memory-controller", 807 807 },
+1 -1
arch/sparc64/kernel/pci_fire.c
··· 547 547 return err; 548 548 } 549 549 550 - static struct of_device_id fire_match[] = { 550 + static struct of_device_id __initdata fire_match[] = { 551 551 { 552 552 .name = "pci", 553 553 .compatible = "pciex108e,80f0",
+1 -1
arch/sparc64/kernel/pci_psycho.c
··· 1099 1099 return err; 1100 1100 } 1101 1101 1102 - static struct of_device_id psycho_match[] = { 1102 + static struct of_device_id __initdata psycho_match[] = { 1103 1103 { 1104 1104 .name = "pci", 1105 1105 .compatible = "pci108e,8000",
+1 -1
arch/sparc64/kernel/pci_sabre.c
··· 885 885 return err; 886 886 } 887 887 888 - static struct of_device_id sabre_match[] = { 888 + static struct of_device_id __initdata sabre_match[] = { 889 889 { 890 890 .name = "pci", 891 891 .compatible = "pci108e,a001",
+1 -1
arch/sparc64/kernel/pci_schizo.c
··· 1504 1504 * and pci108e,8001. So list the chips in reverse chronological 1505 1505 * order. 1506 1506 */ 1507 - static struct of_device_id schizo_match[] = { 1507 + static struct of_device_id __initdata schizo_match[] = { 1508 1508 { 1509 1509 .name = "pci", 1510 1510 .compatible = "pci108e,a801",
+1 -1
arch/sparc64/kernel/pci_sun4v.c
··· 1026 1026 return -ENOMEM; 1027 1027 } 1028 1028 1029 - static struct of_device_id pci_sun4v_match[] = { 1029 + static struct of_device_id __initdata pci_sun4v_match[] = { 1030 1030 { 1031 1031 .name = "pci", 1032 1032 .compatible = "SUNW,sun4v-pci",
+1 -1
arch/sparc64/kernel/power.c
··· 89 89 return 0; 90 90 } 91 91 92 - static struct of_device_id power_match[] = { 92 + static struct of_device_id __initdata power_match[] = { 93 93 { 94 94 .name = "power", 95 95 },
+3 -3
arch/sparc64/kernel/time.c
··· 438 438 return platform_device_register(&rtc_cmos_device); 439 439 } 440 440 441 - static struct of_device_id rtc_match[] = { 441 + static struct of_device_id __initdata rtc_match[] = { 442 442 { 443 443 .name = "rtc", 444 444 .compatible = "m5819", ··· 482 482 return platform_device_register(&rtc_bq4802_device); 483 483 } 484 484 485 - static struct of_device_id bq4802_match[] = { 485 + static struct of_device_id __initdata bq4802_match[] = { 486 486 { 487 487 .name = "rtc", 488 488 .compatible = "bq4802", ··· 566 566 return platform_device_register(&m48t59_rtc); 567 567 } 568 568 569 - static struct of_device_id mostek_match[] = { 569 + static struct of_device_id __initdata mostek_match[] = { 570 570 { 571 571 .name = "eeprom", 572 572 },
+1 -1
drivers/atm/fore200e.c
··· 2685 2685 return 0; 2686 2686 } 2687 2687 2688 - static struct of_device_id fore200e_sba_match[] = { 2688 + static const struct of_device_id fore200e_sba_match[] = { 2689 2689 { 2690 2690 .name = SBA200E_PROM_NAME, 2691 2691 .data = (void *) &fore200e_bus[1],
+1 -1
drivers/char/hw_random/n2-drv.c
··· 736 736 return 0; 737 737 } 738 738 739 - static struct of_device_id n2rng_match[] = { 739 + static const struct of_device_id n2rng_match[] = { 740 740 { 741 741 .name = "random-number-generator", 742 742 .compatible = "SUNW,n2-rng",
+1 -1
drivers/hwmon/ultra45_env.c
··· 290 290 return 0; 291 291 } 292 292 293 - static struct of_device_id env_match[] = { 293 + static const struct of_device_id env_match[] = { 294 294 { 295 295 .name = "env-monitor", 296 296 .compatible = "SUNW,ebus-pic16f747-env",
+2 -2
drivers/input/misc/sparcspkr.c
··· 249 249 return 0; 250 250 } 251 251 252 - static struct of_device_id bbc_beep_match[] = { 252 + static const struct of_device_id bbc_beep_match[] = { 253 253 { 254 254 .name = "beep", 255 255 .compatible = "SUNW,bbc-beep", ··· 328 328 return 0; 329 329 } 330 330 331 - static struct of_device_id grover_beep_match[] = { 331 + static const struct of_device_id grover_beep_match[] = { 332 332 { 333 333 .name = "beep", 334 334 .compatible = "SUNW,smbus-beep",
+1 -1
drivers/input/serio/i8042-sparcio.h
··· 87 87 return 0; 88 88 } 89 89 90 - static struct of_device_id sparc_i8042_match[] = { 90 + static const struct of_device_id sparc_i8042_match[] = { 91 91 { 92 92 .name = "8042", 93 93 },
+1 -1
drivers/mtd/maps/sun_uflash.c
··· 138 138 return 0; 139 139 } 140 140 141 - static struct of_device_id uflash_match[] = { 141 + static const struct of_device_id uflash_match[] = { 142 142 { 143 143 .name = UFLASH_OBPNAME, 144 144 },
+1 -1
drivers/net/myri_sbus.c
··· 1125 1125 return 0; 1126 1126 } 1127 1127 1128 - static struct of_device_id myri_sbus_match[] = { 1128 + static const struct of_device_id myri_sbus_match[] = { 1129 1129 { 1130 1130 .name = "MYRICOM,mlanai", 1131 1131 },
+1 -1
drivers/net/niu.c
··· 9074 9074 return 0; 9075 9075 } 9076 9076 9077 - static struct of_device_id niu_match[] = { 9077 + static const struct of_device_id niu_match[] = { 9078 9078 { 9079 9079 .name = "network", 9080 9080 .compatible = "SUNW,niusl",
+1 -1
drivers/net/sunbmac.c
··· 1281 1281 return 0; 1282 1282 } 1283 1283 1284 - static struct of_device_id bigmac_sbus_match[] = { 1284 + static const struct of_device_id bigmac_sbus_match[] = { 1285 1285 { 1286 1286 .name = "be", 1287 1287 },
+1 -1
drivers/net/sunhme.c
··· 3252 3252 return 0; 3253 3253 } 3254 3254 3255 - static struct of_device_id hme_sbus_match[] = { 3255 + static const struct of_device_id hme_sbus_match[] = { 3256 3256 { 3257 3257 .name = "SUNW,hme", 3258 3258 },
+1 -1
drivers/net/sunlance.c
··· 1571 1571 return 0; 1572 1572 } 1573 1573 1574 - static struct of_device_id sunlance_sbus_match[] = { 1574 + static const struct of_device_id sunlance_sbus_match[] = { 1575 1575 { 1576 1576 .name = "le", 1577 1577 },
+1 -1
drivers/net/sunqe.c
··· 965 965 return 0; 966 966 } 967 967 968 - static struct of_device_id qec_sbus_match[] = { 968 + static const struct of_device_id qec_sbus_match[] = { 969 969 { 970 970 .name = "qe", 971 971 },
+1 -1
drivers/parport/parport_sunbpp.c
··· 372 372 return 0; 373 373 } 374 374 375 - static struct of_device_id bpp_match[] = { 375 + static const struct of_device_id bpp_match[] = { 376 376 { 377 377 .name = "SUNW,bpp", 378 378 },
+1 -1
drivers/sbus/char/bbc_i2c.c
··· 404 404 return 0; 405 405 } 406 406 407 - static struct of_device_id bbc_i2c_match[] = { 407 + static const struct of_device_id bbc_i2c_match[] = { 408 408 { 409 409 .name = "i2c", 410 410 .compatible = "SUNW,bbc-i2c",
+1 -1
drivers/sbus/char/display7seg.c
··· 256 256 return 0; 257 257 } 258 258 259 - static struct of_device_id d7s_match[] = { 259 + static const struct of_device_id d7s_match[] = { 260 260 { 261 261 .name = "display7seg", 262 262 },
+1 -1
drivers/sbus/char/envctrl.c
··· 1120 1120 return 0; 1121 1121 } 1122 1122 1123 - static struct of_device_id envctrl_match[] = { 1123 + static const struct of_device_id envctrl_match[] = { 1124 1124 { 1125 1125 .name = "i2c", 1126 1126 .compatible = "i2cpcf,8584",
+1 -1
drivers/sbus/char/flash.c
··· 199 199 return 0; 200 200 } 201 201 202 - static struct of_device_id flash_match[] = { 202 + static const struct of_device_id flash_match[] = { 203 203 { 204 204 .name = "flashprom", 205 205 },
+1 -1
drivers/sbus/char/uctrl.c
··· 417 417 return 0; 418 418 } 419 419 420 - static struct of_device_id uctrl_match[] = { 420 + static const struct of_device_id uctrl_match[] = { 421 421 { 422 422 .name = "uctrl", 423 423 },
+1 -1
drivers/scsi/qlogicpti.c
··· 1415 1415 return 0; 1416 1416 } 1417 1417 1418 - static struct of_device_id qpti_match[] = { 1418 + static const struct of_device_id qpti_match[] = { 1419 1419 { 1420 1420 .name = "ptisp", 1421 1421 .data = &qpti_template,
+1 -1
drivers/scsi/sun_esp.c
··· 617 617 return 0; 618 618 } 619 619 620 - static struct of_device_id esp_match[] = { 620 + static const struct of_device_id esp_match[] = { 621 621 { 622 622 .name = "SUNW,esp", 623 623 },
+1 -1
drivers/serial/sunhv.c
··· 616 616 return 0; 617 617 } 618 618 619 - static struct of_device_id hv_match[] = { 619 + static const struct of_device_id hv_match[] = { 620 620 { 621 621 .name = "console", 622 622 .compatible = "qcn",
+1 -1
drivers/serial/sunsab.c
··· 1078 1078 return 0; 1079 1079 } 1080 1080 1081 - static struct of_device_id sab_match[] = { 1081 + static const struct of_device_id sab_match[] = { 1082 1082 { 1083 1083 .name = "se", 1084 1084 },
+1 -1
drivers/serial/sunsu.c
··· 1506 1506 return 0; 1507 1507 } 1508 1508 1509 - static struct of_device_id su_match[] = { 1509 + static const struct of_device_id su_match[] = { 1510 1510 { 1511 1511 .name = "su", 1512 1512 },
+1 -1
drivers/serial/sunzilog.c
··· 1480 1480 return 0; 1481 1481 } 1482 1482 1483 - static struct of_device_id zs_match[] = { 1483 + static const struct of_device_id zs_match[] = { 1484 1484 { 1485 1485 .name = "zs", 1486 1486 },
+1 -1
drivers/video/bw2.c
··· 372 372 return 0; 373 373 } 374 374 375 - static struct of_device_id bw2_match[] = { 375 + static const struct of_device_id bw2_match[] = { 376 376 { 377 377 .name = "bwtwo", 378 378 },
+1 -1
drivers/video/cg14.c
··· 589 589 return 0; 590 590 } 591 591 592 - static struct of_device_id cg14_match[] = { 592 + static const struct of_device_id cg14_match[] = { 593 593 { 594 594 .name = "cgfourteen", 595 595 },
+1 -1
drivers/video/cg3.c
··· 456 456 return 0; 457 457 } 458 458 459 - static struct of_device_id cg3_match[] = { 459 + static const struct of_device_id cg3_match[] = { 460 460 { 461 461 .name = "cgthree", 462 462 },
+1 -1
drivers/video/cg6.c
··· 814 814 return 0; 815 815 } 816 816 817 - static struct of_device_id cg6_match[] = { 817 + static const struct of_device_id cg6_match[] = { 818 818 { 819 819 .name = "cgsix", 820 820 },
+1 -1
drivers/video/ffb.c
··· 1042 1042 return 0; 1043 1043 } 1044 1044 1045 - static struct of_device_id ffb_match[] = { 1045 + static const struct of_device_id ffb_match[] = { 1046 1046 { 1047 1047 .name = "SUNW,ffb", 1048 1048 },
+1 -1
drivers/video/leo.c
··· 641 641 return 0; 642 642 } 643 643 644 - static struct of_device_id leo_match[] = { 644 + static const struct of_device_id leo_match[] = { 645 645 { 646 646 .name = "SUNW,leo", 647 647 },
+1 -1
drivers/video/p9100.c
··· 349 349 return 0; 350 350 } 351 351 352 - static struct of_device_id p9100_match[] = { 352 + static const struct of_device_id p9100_match[] = { 353 353 { 354 354 .name = "p9100", 355 355 },
+1 -1
drivers/video/tcx.c
··· 505 505 return 0; 506 506 } 507 507 508 - static struct of_device_id tcx_match[] = { 508 + static const struct of_device_id tcx_match[] = { 509 509 { 510 510 .name = "SUNW,tcx", 511 511 },
+1 -1
drivers/watchdog/cpwd.c
··· 666 666 return 0; 667 667 } 668 668 669 - static struct of_device_id cpwd_match[] = { 669 + static const struct of_device_id cpwd_match[] = { 670 670 { 671 671 .name = "watchdog", 672 672 },
+1 -1
drivers/watchdog/riowd.c
··· 230 230 return 0; 231 231 } 232 232 233 - static struct of_device_id riowd_match[] = { 233 + static const struct of_device_id riowd_match[] = { 234 234 { 235 235 .name = "pmc", 236 236 },
+1 -1
sound/sparc/amd7930.c
··· 1070 1070 return err; 1071 1071 } 1072 1072 1073 - static struct of_device_id amd7930_match[] = { 1073 + static const struct of_device_id amd7930_match[] = { 1074 1074 { 1075 1075 .name = "audio", 1076 1076 },
+1 -1
sound/sparc/cs4231.c
··· 2094 2094 return 0; 2095 2095 } 2096 2096 2097 - static struct of_device_id cs4231_match[] = { 2097 + static const struct of_device_id cs4231_match[] = { 2098 2098 { 2099 2099 .name = "SUNW,CS4231", 2100 2100 },
+1 -1
sound/sparc/dbri.c
··· 2665 2665 return 0; 2666 2666 } 2667 2667 2668 - static struct of_device_id dbri_match[] = { 2668 + static const struct of_device_id dbri_match[] = { 2669 2669 { 2670 2670 .name = "SUNW,DBRIe", 2671 2671 },