]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
sparc: Annotate of_device_id arrays with const or __initdata.
authorDavid S. Miller <davem@davemloft.net>
Sun, 31 Aug 2008 08:23:17 +0000 (01:23 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sun, 31 Aug 2008 08:23:17 +0000 (01:23 -0700)
As suggested by Stephen Rothwell.

Signed-off-by: David S. Miller <davem@davemloft.net>
50 files changed:
arch/sparc/include/asm/parport.h
arch/sparc/kernel/apc.c
arch/sparc/kernel/pmc.c
arch/sparc/kernel/time.c
arch/sparc64/kernel/auxio.c
arch/sparc64/kernel/chmc.c
arch/sparc64/kernel/pci_fire.c
arch/sparc64/kernel/pci_psycho.c
arch/sparc64/kernel/pci_sabre.c
arch/sparc64/kernel/pci_schizo.c
arch/sparc64/kernel/pci_sun4v.c
arch/sparc64/kernel/power.c
arch/sparc64/kernel/time.c
drivers/atm/fore200e.c
drivers/char/hw_random/n2-drv.c
drivers/hwmon/ultra45_env.c
drivers/input/misc/sparcspkr.c
drivers/input/serio/i8042-sparcio.h
drivers/mtd/maps/sun_uflash.c
drivers/net/myri_sbus.c
drivers/net/niu.c
drivers/net/sunbmac.c
drivers/net/sunhme.c
drivers/net/sunlance.c
drivers/net/sunqe.c
drivers/parport/parport_sunbpp.c
drivers/sbus/char/bbc_i2c.c
drivers/sbus/char/display7seg.c
drivers/sbus/char/envctrl.c
drivers/sbus/char/flash.c
drivers/sbus/char/uctrl.c
drivers/scsi/qlogicpti.c
drivers/scsi/sun_esp.c
drivers/serial/sunhv.c
drivers/serial/sunsab.c
drivers/serial/sunsu.c
drivers/serial/sunzilog.c
drivers/video/bw2.c
drivers/video/cg14.c
drivers/video/cg3.c
drivers/video/cg6.c
drivers/video/ffb.c
drivers/video/leo.c
drivers/video/p9100.c
drivers/video/tcx.c
drivers/watchdog/cpwd.c
drivers/watchdog/riowd.c
sound/sparc/amd7930.c
sound/sparc/cs4231.c
sound/sparc/dbri.c

index 70dce0273f999c4639e79a305e7c6ee77b2030b0..dff3f0253aa891c90172b7baef03e767a5c9f90a 100644 (file)
@@ -215,7 +215,7 @@ static int __devexit ecpp_remove(struct of_device *op)
        return 0;
 }
 
-static struct of_device_id ecpp_match[] = {
+static const struct of_device_id ecpp_match[] = {
        {
                .name = "ecpp",
        },
index 0a20cd85fd3197c6bab6f8a5b0eb30d8f2db2d7d..4dd1ba752ce6338376df2f7fd4bb297195ec251a 100644 (file)
@@ -182,7 +182,7 @@ static int __devinit apc_probe(struct of_device *op,
        return 0;
 }
 
-static struct of_device_id apc_match[] = {
+static struct of_device_id __initdata apc_match[] = {
        {
                .name = APC_OBPNAME,
        },
index 9976e82e3233f8556165b7fadde1d402bdb52264..814eb3ce039bd8cc69fbcd6a69ea6b01e52e2900 100644 (file)
@@ -72,7 +72,7 @@ static int __devinit pmc_probe(struct of_device *op,
        return 0;
 }
 
-static struct of_device_id pmc_match[] = {
+static struct of_device_id __initdata pmc_match[] = {
        {
                .name = PMC_OBPNAME,
        },
index a713bb43db84e90e00278a09fa29b5d09de11022..339c4762fbcf08c0fccda3a6a506e64c976b6d76 100644 (file)
@@ -338,7 +338,7 @@ static int __devinit clock_probe(struct of_device *op, const struct of_device_id
        return 0;
 }
 
-static struct of_device_id clock_match[] = {
+static struct of_device_id __initdata clock_match[] = {
        {
                .name = "eeprom",
        },
index dd5c7bf87619b1ef2a3f17fb4adffa1ee7911f26..858beda86524c96fc7c0dfba4b91736104ff4798 100644 (file)
@@ -109,7 +109,7 @@ void auxio_set_lte(int on)
        }
 }
 
-static struct of_device_id auxio_match[] = {
+static struct of_device_id __initdata auxio_match[] = {
        {
                .name = "auxio",
        },
index 3e14952e9407621e9e7415d4276dcc650dd65f9a..2ed401087cab1b02b6cb877da6a6c1f8102acc1d 100644 (file)
@@ -801,7 +801,7 @@ static int __devexit us3mc_remove(struct of_device *op)
        return 0;
 }
 
-static struct of_device_id us3mc_match[] = {
+static const struct of_device_id us3mc_match[] = {
        {
                .name = "memory-controller",
        },
index adc3fe44b0816d8cecf04fc0e7b84554bbae9813..477928aad5385137dcc204c7740deb22afe5f97b 100644 (file)
@@ -547,7 +547,7 @@ out_free:
        return err;
 }
 
-static struct of_device_id fire_match[] = {
+static struct of_device_id __initdata fire_match[] = {
        {
                .name = "pci",
                .compatible = "pciex108e,80f0",
index 4e8f87aad2052413f19b02099d22b0aa7c0d0537..708212a6e7ebf8523a7d492984853ab16ce1fbe4 100644 (file)
@@ -1099,7 +1099,7 @@ out_free:
        return err;
 }
 
-static struct of_device_id psycho_match[] = {
+static struct of_device_id __initdata psycho_match[] = {
        {
                .name = "pci",
                .compatible = "pci108e,8000",
index 7cce4d8f4aaee85ce5cad855742bbb29397a832d..cc476e9a275e4a39e461c2760bd494b679c9ac4c 100644 (file)
@@ -885,7 +885,7 @@ out_free:
        return err;
 }
 
-static struct of_device_id sabre_match[] = {
+static struct of_device_id __initdata sabre_match[] = {
        {
                .name = "pci",
                .compatible = "pci108e,a001",
index b95dd548583adf4601fcfad3c349b1b8df060252..18fdd887b4ac4cb2466dcc7c8fbd8ec8e76e96d5 100644 (file)
@@ -1504,7 +1504,7 @@ static int __devinit schizo_probe(struct of_device *op,
  * and pci108e,8001.  So list the chips in reverse chronological
  * order.
  */
-static struct of_device_id schizo_match[] = {
+static struct of_device_id __initdata schizo_match[] = {
        {
                .name = "pci",
                .compatible = "pci108e,a801",
index c1e72beade2b20c22714138fe58d27aa642a3a13..fea51a054be5fb27b39c5cde346b902650b163bc 100644 (file)
@@ -1026,7 +1026,7 @@ out_free:
        return -ENOMEM;
 }
 
-static struct of_device_id pci_sun4v_match[] = {
+static struct of_device_id __initdata pci_sun4v_match[] = {
        {
                .name = "pci",
                .compatible = "SUNW,sun4v-pci",
index 7536255ab573636a360fe32683afc5bdcafd5f82..7559ad395a33d4bf293d53791899b5e270b25c56 100644 (file)
@@ -89,7 +89,7 @@ static int __devinit power_probe(struct of_device *op, const struct of_device_id
        return 0;
 }
 
-static struct of_device_id power_match[] = {
+static struct of_device_id __initdata power_match[] = {
        {
                .name = "power",
        },
index ea05038a8c16ea1077327a71b931de332aa06f40..209e7d28c3a548d21640d39ca2cd9829ea77ed03 100644 (file)
@@ -438,7 +438,7 @@ static int __devinit rtc_probe(struct of_device *op, const struct of_device_id *
        return platform_device_register(&rtc_cmos_device);
 }
 
-static struct of_device_id rtc_match[] = {
+static struct of_device_id __initdata rtc_match[] = {
        {
                .name = "rtc",
                .compatible = "m5819",
@@ -482,7 +482,7 @@ static int __devinit bq4802_probe(struct of_device *op, const struct of_device_i
        return platform_device_register(&rtc_bq4802_device);
 }
 
-static struct of_device_id bq4802_match[] = {
+static struct of_device_id __initdata bq4802_match[] = {
        {
                .name = "rtc",
                .compatible = "bq4802",
@@ -566,7 +566,7 @@ static int __devinit mostek_probe(struct of_device *op, const struct of_device_i
        return platform_device_register(&m48t59_rtc);
 }
 
-static struct of_device_id mostek_match[] = {
+static struct of_device_id __initdata mostek_match[] = {
        {
                .name = "eeprom",
        },
index c2fa9fdc5d32f68b53ae79d1a366e91c0b1e50ca..937c9c0ef4c9a10baaf38991849c00094389f3fa 100644 (file)
@@ -2685,7 +2685,7 @@ static int __devexit fore200e_sba_remove(struct of_device *op)
        return 0;
 }
 
-static struct of_device_id fore200e_sba_match[] = {
+static const struct of_device_id fore200e_sba_match[] = {
        {
                .name = SBA200E_PROM_NAME,
                .data = (void *) &fore200e_bus[1],
index 5220f541df25e8be038a4a598d6cb82610351a7f..8859aeac2d2510ef6a2a79ea13e364e47f301461 100644 (file)
@@ -736,7 +736,7 @@ static int __devexit n2rng_remove(struct of_device *op)
        return 0;
 }
 
-static struct of_device_id n2rng_match[] = {
+static const struct of_device_id n2rng_match[] = {
        {
                .name           = "random-number-generator",
                .compatible     = "SUNW,n2-rng",
index 9aec95cbf7e915e9530cd6a847808f8e1a28e30a..68e90abeba966e93a55d8b216fce1d73e2d27db7 100644 (file)
@@ -290,7 +290,7 @@ static int __devexit env_remove(struct of_device *op)
        return 0;
 }
 
-static struct of_device_id env_match[] = {
+static const struct of_device_id env_match[] = {
        {
                .name = "env-monitor",
                .compatible = "SUNW,ebus-pic16f747-env",
index d8765cc93d27d5daa1f343edea8bee7e75226117..c4f42311fdec9834a08ba2a331aa1c259bd77b1e 100644 (file)
@@ -249,7 +249,7 @@ static int bbc_remove(struct of_device *op)
        return 0;
 }
 
-static struct of_device_id bbc_beep_match[] = {
+static const struct of_device_id bbc_beep_match[] = {
        {
                .name = "beep",
                .compatible = "SUNW,bbc-beep",
@@ -328,7 +328,7 @@ static int grover_remove(struct of_device *op)
        return 0;
 }
 
-static struct of_device_id grover_beep_match[] = {
+static const struct of_device_id grover_beep_match[] = {
        {
                .name = "beep",
                .compatible = "SUNW,smbus-beep",
index 692a79ec2a22327e98c94ef4946fe2f69b6747da..5071af2c06040f3032d85f4f44be9be5f0202319 100644 (file)
@@ -87,7 +87,7 @@ static int __devexit sparc_i8042_remove(struct of_device *op)
        return 0;
 }
 
-static struct of_device_id sparc_i8042_match[] = {
+static const struct of_device_id sparc_i8042_match[] = {
        {
                .name = "8042",
        },
index e931f1df0af1eecd394fcbb41ef690408ce1fd29..fd7a1017399a069da8f8e78dd62a08d1ad6dcf3e 100644 (file)
@@ -138,7 +138,7 @@ static int __devexit uflash_remove(struct of_device *op)
        return 0;
 }
 
-static struct of_device_id uflash_match[] = {
+static const struct of_device_id uflash_match[] = {
        {
                .name = UFLASH_OBPNAME,
        },
index 03867b10f37ec1f706b3ae964779d2c776c7b89d..979d778b133b8242dba21a3a70468ee066b6d2d6 100644 (file)
@@ -1125,7 +1125,7 @@ static int __devexit myri_sbus_remove(struct of_device *op)
        return 0;
 }
 
-static struct of_device_id myri_sbus_match[] = {
+static const struct of_device_id myri_sbus_match[] = {
        {
                .name = "MYRICOM,mlanai",
        },
index e4765b713abab5afae02980bf6af52d8da8cb8b0..016d9e08692dc520c65ebd78835940ed23f5a0ae 100644 (file)
@@ -9074,7 +9074,7 @@ static int __devexit niu_of_remove(struct of_device *op)
        return 0;
 }
 
-static struct of_device_id niu_match[] = {
+static const struct of_device_id niu_match[] = {
        {
                .name = "network",
                .compatible = "SUNW,niusl",
index 7009a5e36c9757a38ecb6a6918e520c843deb2a4..3f342b35a77f6a48033ad49b77b39372bfc94ba3 100644 (file)
@@ -1281,7 +1281,7 @@ static int __devexit bigmac_sbus_remove(struct of_device *op)
        return 0;
 }
 
-static struct of_device_id bigmac_sbus_match[] = {
+static const struct of_device_id bigmac_sbus_match[] = {
        {
                .name = "be",
        },
index dc46e97ac1225330b40382f5cbf52bee000a649a..f1ebeb5f65b2f56d6ba3a6ee9da9eb579cfb16d1 100644 (file)
@@ -3252,7 +3252,7 @@ static int __devexit hme_sbus_remove(struct of_device *op)
        return 0;
 }
 
-static struct of_device_id hme_sbus_match[] = {
+static const struct of_device_id hme_sbus_match[] = {
        {
                .name = "SUNW,hme",
        },
index 292feb2154b4214e67eef0a3c6305b13ff58c4be..30cdb81853b4ff1b19683b57ee90c9400d8c2b2c 100644 (file)
@@ -1571,7 +1571,7 @@ static int __devexit sunlance_sbus_remove(struct of_device *op)
        return 0;
 }
 
-static struct of_device_id sunlance_sbus_match[] = {
+static const struct of_device_id sunlance_sbus_match[] = {
        {
                .name = "le",
        },
index 81604cac8e3ecbb08d1cd3faf54ae64dec112328..f63644744ff9dafafb56eb746d3acf5018b3733f 100644 (file)
@@ -965,7 +965,7 @@ static int __devexit qec_sbus_remove(struct of_device *op)
        return 0;
 }
 
-static struct of_device_id qec_sbus_match[] = {
+static const struct of_device_id qec_sbus_match[] = {
        {
                .name = "qe",
        },
index e4f00c6dfe097ec605652e13957ea0a8959b31dc..065f229580d5cfc3acd8d740597bb638c558a889 100644 (file)
@@ -372,7 +372,7 @@ static int __devexit bpp_remove(struct of_device *op)
        return 0;
 }
 
-static struct of_device_id bpp_match[] = {
+static const struct of_device_id bpp_match[] = {
        {
                .name = "SUNW,bpp",
        },
index af7f4af6c5fbab9f906ac8a94fe30be525408517..f08e169ba1b51a150372753672741df102818591 100644 (file)
@@ -404,7 +404,7 @@ static int __devexit bbc_i2c_remove(struct of_device *op)
        return 0;
 }
 
-static struct of_device_id bbc_i2c_match[] = {
+static const struct of_device_id bbc_i2c_match[] = {
        {
                .name = "i2c",
                .compatible = "SUNW,bbc-i2c",
index 2f16d78e92d75f70fe7b0a217eb4e6afbfc1cfb2..2550af4ae432a6bb6cd82c1fbf2c6eccbecb1e99 100644 (file)
@@ -256,7 +256,7 @@ static int __devexit d7s_remove(struct of_device *op)
        return 0;
 }
 
-static struct of_device_id d7s_match[] = {
+static const struct of_device_id d7s_match[] = {
        {
                .name = "display7seg",
        },
index ea8c35cbffd307a07f9e14139a6e5f540b64c4ac..58e583b61e60cbc809145041df5eb553dec5db13 100644 (file)
@@ -1120,7 +1120,7 @@ static int __devexit envctrl_remove(struct of_device *op)
        return 0;
 }
 
-static struct of_device_id envctrl_match[] = {
+static const struct of_device_id envctrl_match[] = {
        {
                .name = "i2c",
                .compatible = "i2cpcf,8584",
index 715996f5c53855dfe1901b682da6357ddc5e5969..41083472ff4f46298ce3c8f97484d38df6acb788 100644 (file)
@@ -199,7 +199,7 @@ static int __devexit flash_remove(struct of_device *op)
        return 0;
 }
 
-static struct of_device_id flash_match[] = {
+static const struct of_device_id flash_match[] = {
        {
                .name = "flashprom",
        },
index 6cff9777bbc076815f2f988984081a6c61cb9fbf..27993c37775d863f62b9ff55515753d40dc19d29 100644 (file)
@@ -417,7 +417,7 @@ static int __devexit uctrl_remove(struct of_device *op)
        return 0;
 }
 
-static struct of_device_id uctrl_match[] = {
+static const struct of_device_id uctrl_match[] = {
        {
                .name = "uctrl",
        },
index b6ce82d3de3d36ddf125b697981c25a974dc6ff5..42807671512bdabaaec44061901776e0a1bef6c8 100644 (file)
@@ -1415,7 +1415,7 @@ static int __devexit qpti_sbus_remove(struct of_device *op)
        return 0;
 }
 
-static struct of_device_id qpti_match[] = {
+static const struct of_device_id qpti_match[] = {
        {
                .name = "ptisp",
                .data = &qpti_template,
index 97316ca28a7a36b9437c4625f7d6a5562dbb46ca..3d73aad4bc8201196946e2a1e2c19e4e98157327 100644 (file)
@@ -617,7 +617,7 @@ static int __devexit esp_sbus_remove(struct of_device *op)
        return 0;
 }
 
-static struct of_device_id esp_match[] = {
+static const struct of_device_id esp_match[] = {
        {
                .name = "SUNW,esp",
        },
index e41766d08035643e18b72a2cfb88bf471355d885..a94a2ab4b5716cbb983d8d3d81e2d3e505dbc3e4 100644 (file)
@@ -616,7 +616,7 @@ static int __devexit hv_remove(struct of_device *dev)
        return 0;
 }
 
-static struct of_device_id hv_match[] = {
+static const struct of_device_id hv_match[] = {
        {
                .name = "console",
                .compatible = "qcn",
index 29b4458abf744601f39a672bcb0333f5c92b519d..0355efe115d98d73f1f68842e6dd3364a73d28b7 100644 (file)
@@ -1078,7 +1078,7 @@ static int __devexit sab_remove(struct of_device *op)
        return 0;
 }
 
-static struct of_device_id sab_match[] = {
+static const struct of_device_id sab_match[] = {
        {
                .name = "se",
        },
index a378464f92927e83fde05e4e236eaa4f413f1aa5..a4dc79b1d7ab4b2d5f6df9e1a98a22c4d3d89fd9 100644 (file)
@@ -1506,7 +1506,7 @@ static int __devexit su_remove(struct of_device *op)
        return 0;
 }
 
-static struct of_device_id su_match[] = {
+static const struct of_device_id su_match[] = {
        {
                .name = "su",
        },
index 3cb4c8aee13fa74461648ff3a4ec9f12380fbba3..45a299f35617bc8eb27bd8b0fef9c6256f2cdbf0 100644 (file)
@@ -1480,7 +1480,7 @@ static int __devexit zs_remove(struct of_device *op)
        return 0;
 }
 
-static struct of_device_id zs_match[] = {
+static const struct of_device_id zs_match[] = {
        {
                .name = "zs",
        },
index e721644bad743c27313b4d78db17b3f87a10de94..1e35ba6f18e01ef44eeda30e5685a9eb2f556317 100644 (file)
@@ -372,7 +372,7 @@ static int __devexit bw2_remove(struct of_device *op)
        return 0;
 }
 
-static struct of_device_id bw2_match[] = {
+static const struct of_device_id bw2_match[] = {
        {
                .name = "bwtwo",
        },
index b17e746717795615dc71a710abb801e9920eef7b..a2d1882791a58e11956b250afbca92fa520b9e79 100644 (file)
@@ -589,7 +589,7 @@ static int __devexit cg14_remove(struct of_device *op)
        return 0;
 }
 
-static struct of_device_id cg14_match[] = {
+static const struct of_device_id cg14_match[] = {
        {
                .name = "cgfourteen",
        },
index 3aa7b6cb0268591283b72f77425344be184d1420..99f87fb61d0558e816541fe0f133f79c2700decc 100644 (file)
@@ -456,7 +456,7 @@ static int __devexit cg3_remove(struct of_device *op)
        return 0;
 }
 
-static struct of_device_id cg3_match[] = {
+static const struct of_device_id cg3_match[] = {
        {
                .name = "cgthree",
        },
index 2f64bb3bd2540e7f5c77c03e7d5894578ddad572..9eaa63ab08fa2dabe13d8b9be8d4cebfdef43fcc 100644 (file)
@@ -814,7 +814,7 @@ static int __devexit cg6_remove(struct of_device *op)
        return 0;
 }
 
-static struct of_device_id cg6_match[] = {
+static const struct of_device_id cg6_match[] = {
        {
                .name = "cgsix",
        },
index 7992b13ee68fcac9a60840b0e17a9a3581e6713c..9dbb9646081f670a92c6c29733184a25c4ef107e 100644 (file)
@@ -1042,7 +1042,7 @@ static int __devexit ffb_remove(struct of_device *op)
        return 0;
 }
 
-static struct of_device_id ffb_match[] = {
+static const struct of_device_id ffb_match[] = {
        {
                .name = "SUNW,ffb",
        },
index 13fea61d6ae4cbf2bcdbca442eab84716e6e3499..465459e5eae656085876e3532c91b167d812d14d 100644 (file)
@@ -641,7 +641,7 @@ static int __devexit leo_remove(struct of_device *op)
        return 0;
 }
 
-static struct of_device_id leo_match[] = {
+static const struct of_device_id leo_match[] = {
        {
                .name = "SUNW,leo",
        },
index 9e903454ffc138b053c4ad32f7b12dd3636e8f94..7000f2cd58542e54668d58ecb3374e5c6c23d3fb 100644 (file)
@@ -349,7 +349,7 @@ static int __devexit p9100_remove(struct of_device *op)
        return 0;
 }
 
-static struct of_device_id p9100_match[] = {
+static const struct of_device_id p9100_match[] = {
        {
                .name = "p9100",
        },
index 2a03f78bbb0d53f60db6eaba3be24d09e31d4cdd..643afbfe8277bfe9bf03bf35a80c5d4a83e98841 100644 (file)
@@ -505,7 +505,7 @@ static int __devexit tcx_remove(struct of_device *op)
        return 0;
 }
 
-static struct of_device_id tcx_match[] = {
+static const struct of_device_id tcx_match[] = {
        {
                .name = "SUNW,tcx",
        },
index 1f1ee2520f172e244ffe1a590591160bb97c0a44..084dfe9cecfb617575f5c82bc770aaa69db972b3 100644 (file)
@@ -666,7 +666,7 @@ static int __devexit cpwd_remove(struct of_device *op)
        return 0;
 }
 
-static struct of_device_id cpwd_match[] = {
+static const struct of_device_id cpwd_match[] = {
        {
                .name = "watchdog",
        },
index 04fd1bac2db5f3aff4f092e10aefd6a9aad617d8..09cb1833ea27a754be67934c98d12396f3f623a7 100644 (file)
@@ -230,7 +230,7 @@ static int __devexit riowd_remove(struct of_device *op)
        return 0;
 }
 
-static struct of_device_id riowd_match[] = {
+static const struct of_device_id riowd_match[] = {
        {
                .name = "pmc",
        },
index 0f82c3f6cfdb517f8f2659aca9649343437a0755..5af5503edadb635836e3106de252812b250f6b8e 100644 (file)
@@ -1070,7 +1070,7 @@ out_err:
        return err;
 }
 
-static struct of_device_id amd7930_match[] = {
+static const struct of_device_id amd7930_match[] = {
        {
                .name = "audio",
        },
index cdbfae96bd88e5f3dfdfcb06b6947fa73dcf987d..727438d276eb744038f26a28053af59aedb3864f 100644 (file)
@@ -2094,7 +2094,7 @@ static int __devexit cs4231_remove(struct of_device *op)
        return 0;
 }
 
-static struct of_device_id cs4231_match[] = {
+static const struct of_device_id cs4231_match[] = {
        {
                .name = "SUNW,CS4231",
        },
index 446f985b76fb9f827feacec33ed9cfe767cfcf46..2edb0ad3de7e7f640840828b43b586152ee685cc 100644 (file)
@@ -2665,7 +2665,7 @@ static int __devexit dbri_remove(struct of_device *op)
        return 0;
 }
 
-static struct of_device_id dbri_match[] = {
+static const struct of_device_id dbri_match[] = {
        {
                .name = "SUNW,DBRIe",
        },