summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-08-31 10:23:17 +0200
committerDavid S. Miller <davem@davemloft.net>2008-08-31 10:23:17 +0200
commitfd098316ef533e8441576f020ead4beab93154ce (patch)
tree6188bbbf2357585dbeeac9d055ef2e771b78bac8 /arch
parentsparc: Stop setting NO_DMA. (diff)
downloadlinux-fd098316ef533e8441576f020ead4beab93154ce.tar.xz
linux-fd098316ef533e8441576f020ead4beab93154ce.zip
sparc: Annotate of_device_id arrays with const or __initdata.
As suggested by Stephen Rothwell. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch')
-rw-r--r--arch/sparc/include/asm/parport.h2
-rw-r--r--arch/sparc/kernel/apc.c2
-rw-r--r--arch/sparc/kernel/pmc.c2
-rw-r--r--arch/sparc/kernel/time.c2
-rw-r--r--arch/sparc64/kernel/auxio.c2
-rw-r--r--arch/sparc64/kernel/chmc.c2
-rw-r--r--arch/sparc64/kernel/pci_fire.c2
-rw-r--r--arch/sparc64/kernel/pci_psycho.c2
-rw-r--r--arch/sparc64/kernel/pci_sabre.c2
-rw-r--r--arch/sparc64/kernel/pci_schizo.c2
-rw-r--r--arch/sparc64/kernel/pci_sun4v.c2
-rw-r--r--arch/sparc64/kernel/power.c2
-rw-r--r--arch/sparc64/kernel/time.c6
13 files changed, 15 insertions, 15 deletions
diff --git a/arch/sparc/include/asm/parport.h b/arch/sparc/include/asm/parport.h
index 70dce0273f99..dff3f0253aa8 100644
--- a/arch/sparc/include/asm/parport.h
+++ b/arch/sparc/include/asm/parport.h
@@ -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",
},
diff --git a/arch/sparc/kernel/apc.c b/arch/sparc/kernel/apc.c
index 0a20cd85fd31..4dd1ba752ce6 100644
--- a/arch/sparc/kernel/apc.c
+++ b/arch/sparc/kernel/apc.c
@@ -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,
},
diff --git a/arch/sparc/kernel/pmc.c b/arch/sparc/kernel/pmc.c
index 9976e82e3233..814eb3ce039b 100644
--- a/arch/sparc/kernel/pmc.c
+++ b/arch/sparc/kernel/pmc.c
@@ -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,
},
diff --git a/arch/sparc/kernel/time.c b/arch/sparc/kernel/time.c
index a713bb43db84..339c4762fbcf 100644
--- a/arch/sparc/kernel/time.c
+++ b/arch/sparc/kernel/time.c
@@ -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",
},
diff --git a/arch/sparc64/kernel/auxio.c b/arch/sparc64/kernel/auxio.c
index dd5c7bf87619..858beda86524 100644
--- a/arch/sparc64/kernel/auxio.c
+++ b/arch/sparc64/kernel/auxio.c
@@ -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",
},
diff --git a/arch/sparc64/kernel/chmc.c b/arch/sparc64/kernel/chmc.c
index 3e14952e9407..2ed401087cab 100644
--- a/arch/sparc64/kernel/chmc.c
+++ b/arch/sparc64/kernel/chmc.c
@@ -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",
},
diff --git a/arch/sparc64/kernel/pci_fire.c b/arch/sparc64/kernel/pci_fire.c
index adc3fe44b081..477928aad538 100644
--- a/arch/sparc64/kernel/pci_fire.c
+++ b/arch/sparc64/kernel/pci_fire.c
@@ -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",
diff --git a/arch/sparc64/kernel/pci_psycho.c b/arch/sparc64/kernel/pci_psycho.c
index 4e8f87aad205..708212a6e7eb 100644
--- a/arch/sparc64/kernel/pci_psycho.c
+++ b/arch/sparc64/kernel/pci_psycho.c
@@ -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",
diff --git a/arch/sparc64/kernel/pci_sabre.c b/arch/sparc64/kernel/pci_sabre.c
index 7cce4d8f4aae..cc476e9a275e 100644
--- a/arch/sparc64/kernel/pci_sabre.c
+++ b/arch/sparc64/kernel/pci_sabre.c
@@ -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",
diff --git a/arch/sparc64/kernel/pci_schizo.c b/arch/sparc64/kernel/pci_schizo.c
index b95dd548583a..18fdd887b4ac 100644
--- a/arch/sparc64/kernel/pci_schizo.c
+++ b/arch/sparc64/kernel/pci_schizo.c
@@ -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",
diff --git a/arch/sparc64/kernel/pci_sun4v.c b/arch/sparc64/kernel/pci_sun4v.c
index c1e72beade2b..fea51a054be5 100644
--- a/arch/sparc64/kernel/pci_sun4v.c
+++ b/arch/sparc64/kernel/pci_sun4v.c
@@ -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",
diff --git a/arch/sparc64/kernel/power.c b/arch/sparc64/kernel/power.c
index 7536255ab573..7559ad395a33 100644
--- a/arch/sparc64/kernel/power.c
+++ b/arch/sparc64/kernel/power.c
@@ -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",
},
diff --git a/arch/sparc64/kernel/time.c b/arch/sparc64/kernel/time.c
index ea05038a8c16..209e7d28c3a5 100644
--- a/arch/sparc64/kernel/time.c
+++ b/arch/sparc64/kernel/time.c
@@ -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",
},