[PATCH 3/7] [trusty SRU] (upstream) drivers: net: xgene: constify of_device_id array

Craig Magina craig.magina at canonical.com
Fri May 22 20:49:17 UTC 2015


From: Fabian Frederick <fabf at skynet.be>

of_device_id is always used as const.
(See driver.of_match_table and open firmware functions)

BugLink: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1458042

Signed-off-by: Fabian Frederick <fabf at skynet.be>
Signed-off-by: David S. Miller <davem at davemloft.net>
(cherry picked from commit a6b0dc2af494456b197048b75321a871e13dc398)
Signed-off-by: Phong Vo <pvo at apm.com>
Signed-off-by: Craig Magina <craig.magina at canonical.com>

Conflicts:
	drivers/net/ethernet/apm/xgene/xgene_enet_main.c
---
 drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
index a8a27b3..7e08a46 100644
--- a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
@@ -977,7 +977,7 @@ static int xgene_enet_remove(struct platform_device *pdev)
 	return 0;
 }
 
-static struct of_device_id xgene_enet_match[] = {
+static const struct of_device_id xgene_enet_match[] = {
 	{.compatible = "apm,xgene-enet",},
 	{.compatible = "apm,xgene1-sgenet",},
 	{.compatible = "apm,xgene1-xgenet",},
-- 
2.1.4





More information about the kernel-team mailing list