aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabian Frederick <fabf@skynet.be>2015-03-17 14:37:34 -0400
committerDavid S. Miller <davem@davemloft.net>2015-03-17 15:00:21 -0400
commit94e5a2a88affa2ff9f95c8577166d2954a110ea8 (patch)
treed1cf0458028d703a8c610d5b274109c54c666549
parent27260530db1d926905c2c4e904cb8468b4373c03 (diff)
net/fsl: constify of_device_id array
of_device_id is always used as const. (See driver.of_match_table and open firmware functions) Signed-off-by: Fabian Frederick <fabf@skynet.be> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ethernet/freescale/fec_mpc52xx.c2
-rw-r--r--drivers/net/ethernet/freescale/fec_mpc52xx_phy.c2
-rw-r--r--drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c4
-rw-r--r--drivers/net/ethernet/freescale/fs_enet/mii-bitbang.c2
-rw-r--r--drivers/net/ethernet/freescale/fs_enet/mii-fec.c4
-rw-r--r--drivers/net/ethernet/freescale/fsl_pq_mdio.c2
-rw-r--r--drivers/net/ethernet/freescale/gianfar.c2
-rw-r--r--drivers/net/ethernet/freescale/gianfar_ptp.c2
-rw-r--r--drivers/net/ethernet/freescale/ucc_geth.c2
-rw-r--r--drivers/net/ethernet/freescale/xgmac_mdio.c2
10 files changed, 12 insertions, 12 deletions
diff --git a/drivers/net/ethernet/freescale/fec_mpc52xx.c b/drivers/net/ethernet/freescale/fec_mpc52xx.c
index f495796248db..afe7f39cdd7c 100644
--- a/drivers/net/ethernet/freescale/fec_mpc52xx.c
+++ b/drivers/net/ethernet/freescale/fec_mpc52xx.c
@@ -1057,7 +1057,7 @@ static int mpc52xx_fec_of_resume(struct platform_device *op)
1057} 1057}
1058#endif 1058#endif
1059 1059
1060static struct of_device_id mpc52xx_fec_match[] = { 1060static const struct of_device_id mpc52xx_fec_match[] = {
1061 { .compatible = "fsl,mpc5200b-fec", }, 1061 { .compatible = "fsl,mpc5200b-fec", },
1062 { .compatible = "fsl,mpc5200-fec", }, 1062 { .compatible = "fsl,mpc5200-fec", },
1063 { .compatible = "mpc5200-fec", }, 1063 { .compatible = "mpc5200-fec", },
diff --git a/drivers/net/ethernet/freescale/fec_mpc52xx_phy.c b/drivers/net/ethernet/freescale/fec_mpc52xx_phy.c
index e0528900db02..1e647beaf989 100644
--- a/drivers/net/ethernet/freescale/fec_mpc52xx_phy.c
+++ b/drivers/net/ethernet/freescale/fec_mpc52xx_phy.c
@@ -134,7 +134,7 @@ static int mpc52xx_fec_mdio_remove(struct platform_device *of)
134 return 0; 134 return 0;
135} 135}
136 136
137static struct of_device_id mpc52xx_fec_mdio_match[] = { 137static const struct of_device_id mpc52xx_fec_mdio_match[] = {
138 { .compatible = "fsl,mpc5200b-mdio", }, 138 { .compatible = "fsl,mpc5200b-mdio", },
139 { .compatible = "fsl,mpc5200-mdio", }, 139 { .compatible = "fsl,mpc5200-mdio", },
140 { .compatible = "mpc5200b-fec-phy", }, 140 { .compatible = "mpc5200b-fec-phy", },
diff --git a/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c b/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c
index a17628769a1f..9b3639eae676 100644
--- a/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c
+++ b/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c
@@ -916,7 +916,7 @@ static const struct net_device_ops fs_enet_netdev_ops = {
916#endif 916#endif
917}; 917};
918 918
919static struct of_device_id fs_enet_match[]; 919static const struct of_device_id fs_enet_match[];
920static int fs_enet_probe(struct platform_device *ofdev) 920static int fs_enet_probe(struct platform_device *ofdev)
921{ 921{
922 const struct of_device_id *match; 922 const struct of_device_id *match;
@@ -1082,7 +1082,7 @@ static int fs_enet_remove(struct platform_device *ofdev)
1082 return 0; 1082 return 0;
1083} 1083}
1084 1084
1085static struct of_device_id fs_enet_match[] = { 1085static const struct of_device_id fs_enet_match[] = {
1086#ifdef CONFIG_FS_ENET_HAS_SCC 1086#ifdef CONFIG_FS_ENET_HAS_SCC
1087 { 1087 {
1088 .compatible = "fsl,cpm1-scc-enet", 1088 .compatible = "fsl,cpm1-scc-enet",
diff --git a/drivers/net/ethernet/freescale/fs_enet/mii-bitbang.c b/drivers/net/ethernet/freescale/fs_enet/mii-bitbang.c
index 1d5617d2d8bd..68a428de0bc0 100644
--- a/drivers/net/ethernet/freescale/fs_enet/mii-bitbang.c
+++ b/drivers/net/ethernet/freescale/fs_enet/mii-bitbang.c
@@ -213,7 +213,7 @@ static int fs_enet_mdio_remove(struct platform_device *ofdev)
213 return 0; 213 return 0;
214} 214}
215 215
216static struct of_device_id fs_enet_mdio_bb_match[] = { 216static const struct of_device_id fs_enet_mdio_bb_match[] = {
217 { 217 {
218 .compatible = "fsl,cpm2-mdio-bitbang", 218 .compatible = "fsl,cpm2-mdio-bitbang",
219 }, 219 },
diff --git a/drivers/net/ethernet/freescale/fs_enet/mii-fec.c b/drivers/net/ethernet/freescale/fs_enet/mii-fec.c
index 1648e3582500..2be383e6d258 100644
--- a/drivers/net/ethernet/freescale/fs_enet/mii-fec.c
+++ b/drivers/net/ethernet/freescale/fs_enet/mii-fec.c
@@ -95,7 +95,7 @@ static int fs_enet_fec_mii_write(struct mii_bus *bus, int phy_id, int location,
95 95
96} 96}
97 97
98static struct of_device_id fs_enet_mdio_fec_match[]; 98static const struct of_device_id fs_enet_mdio_fec_match[];
99static int fs_enet_mdio_probe(struct platform_device *ofdev) 99static int fs_enet_mdio_probe(struct platform_device *ofdev)
100{ 100{
101 const struct of_device_id *match; 101 const struct of_device_id *match;
@@ -208,7 +208,7 @@ static int fs_enet_mdio_remove(struct platform_device *ofdev)
208 return 0; 208 return 0;
209} 209}
210 210
211static struct of_device_id fs_enet_mdio_fec_match[] = { 211static const struct of_device_id fs_enet_mdio_fec_match[] = {
212 { 212 {
213 .compatible = "fsl,pq1-fec-mdio", 213 .compatible = "fsl,pq1-fec-mdio",
214 }, 214 },
diff --git a/drivers/net/ethernet/freescale/fsl_pq_mdio.c b/drivers/net/ethernet/freescale/fsl_pq_mdio.c
index d1a91e344e6b..3c40f6b99224 100644
--- a/drivers/net/ethernet/freescale/fsl_pq_mdio.c
+++ b/drivers/net/ethernet/freescale/fsl_pq_mdio.c
@@ -294,7 +294,7 @@ static void ucc_configure(phys_addr_t start, phys_addr_t end)
294 294
295#endif 295#endif
296 296
297static struct of_device_id fsl_pq_mdio_match[] = { 297static const struct of_device_id fsl_pq_mdio_match[] = {
298#if defined(CONFIG_GIANFAR) || defined(CONFIG_GIANFAR_MODULE) 298#if defined(CONFIG_GIANFAR) || defined(CONFIG_GIANFAR_MODULE)
299 { 299 {
300 .compatible = "fsl,gianfar-tbi", 300 .compatible = "fsl,gianfar-tbi",
diff --git a/drivers/net/ethernet/freescale/gianfar.c b/drivers/net/ethernet/freescale/gianfar.c
index 70fa6887f940..4ee080d49bc0 100644
--- a/drivers/net/ethernet/freescale/gianfar.c
+++ b/drivers/net/ethernet/freescale/gianfar.c
@@ -3594,7 +3594,7 @@ static noinline void gfar_update_link_state(struct gfar_private *priv)
3594 phy_print_status(phydev); 3594 phy_print_status(phydev);
3595} 3595}
3596 3596
3597static struct of_device_id gfar_match[] = 3597static const struct of_device_id gfar_match[] =
3598{ 3598{
3599 { 3599 {
3600 .type = "network", 3600 .type = "network",
diff --git a/drivers/net/ethernet/freescale/gianfar_ptp.c b/drivers/net/ethernet/freescale/gianfar_ptp.c
index 16826341a4c9..77353366f33b 100644
--- a/drivers/net/ethernet/freescale/gianfar_ptp.c
+++ b/drivers/net/ethernet/freescale/gianfar_ptp.c
@@ -554,7 +554,7 @@ static int gianfar_ptp_remove(struct platform_device *dev)
554 return 0; 554 return 0;
555} 555}
556 556
557static struct of_device_id match_table[] = { 557static const struct of_device_id match_table[] = {
558 { .compatible = "fsl,etsec-ptp" }, 558 { .compatible = "fsl,etsec-ptp" },
559 {}, 559 {},
560}; 560};
diff --git a/drivers/net/ethernet/freescale/ucc_geth.c b/drivers/net/ethernet/freescale/ucc_geth.c
index 357e8b576905..bfdccbd58be0 100644
--- a/drivers/net/ethernet/freescale/ucc_geth.c
+++ b/drivers/net/ethernet/freescale/ucc_geth.c
@@ -3930,7 +3930,7 @@ static int ucc_geth_remove(struct platform_device* ofdev)
3930 return 0; 3930 return 0;
3931} 3931}
3932 3932
3933static struct of_device_id ucc_geth_match[] = { 3933static const struct of_device_id ucc_geth_match[] = {
3934 { 3934 {
3935 .type = "network", 3935 .type = "network",
3936 .compatible = "ucc_geth", 3936 .compatible = "ucc_geth",
diff --git a/drivers/net/ethernet/freescale/xgmac_mdio.c b/drivers/net/ethernet/freescale/xgmac_mdio.c
index cd40b686e0a6..7b8fe866f603 100644
--- a/drivers/net/ethernet/freescale/xgmac_mdio.c
+++ b/drivers/net/ethernet/freescale/xgmac_mdio.c
@@ -307,7 +307,7 @@ static int xgmac_mdio_remove(struct platform_device *pdev)
307 return 0; 307 return 0;
308} 308}
309 309
310static struct of_device_id xgmac_mdio_match[] = { 310static const struct of_device_id xgmac_mdio_match[] = {
311 { 311 {
312 .compatible = "fsl,fman-xmdio", 312 .compatible = "fsl,fman-xmdio",
313 }, 313 },