openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'const_of_device_id' 

Fabian Frederick says:

====================
drivers/net: constify of_device_id array

This small patchset adds const to of_device_id arrays in
drivers/net branch.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2015-03-17 15:00:28 -04:00
parent 617011e7d5 2c71ec9963
commit 9cf7867c24
40 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/can/cc770/cc770_platform.c
View File

@ -254,7 +254,7 @@ static int cc770_platform_remove(struct platform_device *pdev)
return 0;
}
static struct of_device_id cc770_platform_table[] = {
static const struct of_device_id cc770_platform_table[] = {
{.compatible = "bosch,cc770"}, /* CC770 from Bosch */
{.compatible = "intc,82527"}, /* AN82527 from Intel CP */
{},

2
drivers/net/can/grcan.c
View File

@ -1725,7 +1725,7 @@ static int grcan_remove(struct platform_device *ofdev)
return 0;
}
static struct of_device_id grcan_match[] = {
static const struct of_device_id grcan_match[] = {
{.name = "GAISLER_GRCAN"},
{.name = "01_03d"},
{.name = "GAISLER_GRHCAN"},

2
drivers/net/can/mscan/mpc5xxx_can.c
View File

@ -43,7 +43,7 @@ struct mpc5xxx_can_data {
};
#ifdef CONFIG_PPC_MPC52xx
static struct of_device_id mpc52xx_cdm_ids[] = {
static const struct of_device_id mpc52xx_cdm_ids[] = {
{ .compatible = "fsl,mpc5200-cdm", },
{}
};

2
drivers/net/can/sja1000/sja1000_platform.c
View File

@ -242,7 +242,7 @@ static int sp_remove(struct platform_device *pdev)
return 0;
}
static struct of_device_id sp_of_table[] = {
static const struct of_device_id sp_of_table[] = {
{.compatible = "nxp,sja1000"},
{},
};

2
drivers/net/can/xilinx_can.c
View File

@ -1185,7 +1185,7 @@ static int xcan_remove(struct platform_device *pdev)
}
/* Match table for OF platform binding */
static struct of_device_id xcan_of_match[] = {
static const struct of_device_id xcan_of_match[] = {
{ .compatible = "xlnx,zynq-can-1.0", },
{ .compatible = "xlnx,axi-can-1.00.a", },
{ /* end of list */ },

2
drivers/net/ethernet/aeroflex/greth.c
View File

@ -1588,7 +1588,7 @@ static int greth_of_remove(struct platform_device *of_dev)
return 0;
}
static struct of_device_id greth_of_match[] = {
static const struct of_device_id greth_of_match[] = {
{
.name = "GAISLER_ETHMAC",
},

4
drivers/net/ethernet/altera/altera_tse_main.c
View File

@ -89,7 +89,7 @@ MODULE_PARM_DESC(dma_tx_num, "Number of descriptors in the TX list");
#define TXQUEUESTOP_THRESHHOLD 2
static struct of_device_id altera_tse_ids[];
static const struct of_device_id altera_tse_ids[];
static inline u32 tse_tx_avail(struct altera_tse_private *priv)
{
@ -1576,7 +1576,7 @@ static const struct altera_dmaops altera_dtype_msgdma = {
.start_rxdma = msgdma_start_rxdma,
};
static struct of_device_id altera_tse_ids[] = {
static const struct of_device_id altera_tse_ids[] = {
{ .compatible = "altr,tse-msgdma-1.0", .data = &altera_dtype_msgdma, },
{ .compatible = "altr,tse-1.0", .data = &altera_dtype_sgdma, },
{ .compatible = "ALTR,tse-1.0", .data = &altera_dtype_sgdma, },

2
drivers/net/ethernet/apm/xgene/xgene_enet_main.c
View File

@ -1033,7 +1033,7 @@ MODULE_DEVICE_TABLE(acpi, xgene_enet_acpi_match);
#endif
#ifdef CONFIG_OF
static struct of_device_id xgene_enet_of_match[] = {
static const struct of_device_id xgene_enet_of_match[] = {
{.compatible = "apm,xgene-enet",},
{.compatible = "apm,xgene1-sgenet",},
{.compatible = "apm,xgene1-xgenet",},

2
drivers/net/ethernet/apple/bmac.c
View File

@ -1621,7 +1621,7 @@ static int bmac_remove(struct macio_dev *mdev)
return 0;
}
static struct of_device_id bmac_match[] =
static const struct of_device_id bmac_match[] =
{
{
.name = "bmac",

2
drivers/net/ethernet/apple/mace.c
View File

@ -984,7 +984,7 @@ static irqreturn_t mace_rxdma_intr(int irq, void *dev_id)
return IRQ_HANDLED;
}
static struct of_device_id mace_match[] =
static const struct of_device_id mace_match[] =
{
{
.name = "mace",

2
drivers/net/ethernet/ethoc.c
View File

@ -1299,7 +1299,7 @@ static int ethoc_resume(struct platform_device *pdev)
# define ethoc_resume NULL
#endif
static struct of_device_id ethoc_match[] = {
static const struct of_device_id ethoc_match[] = {
{ .compatible = "opencores,ethoc", },
{},
};

2
drivers/net/ethernet/freescale/fec_mpc52xx.c
View File

@ -1057,7 +1057,7 @@ static int mpc52xx_fec_of_resume(struct platform_device *op)
}
#endif
static struct of_device_id mpc52xx_fec_match[] = {
static const struct of_device_id mpc52xx_fec_match[] = {
{ .compatible = "fsl,mpc5200b-fec", },
{ .compatible = "fsl,mpc5200-fec", },
{ .compatible = "mpc5200-fec", },

2
drivers/net/ethernet/freescale/fec_mpc52xx_phy.c
View File

@ -134,7 +134,7 @@ static int mpc52xx_fec_mdio_remove(struct platform_device *of)
return 0;
}
static struct of_device_id mpc52xx_fec_mdio_match[] = {
static const struct of_device_id mpc52xx_fec_mdio_match[] = {
{ .compatible = "fsl,mpc5200b-mdio", },
{ .compatible = "fsl,mpc5200-mdio", },
{ .compatible = "mpc5200b-fec-phy", },

4
drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c
View File

@ -916,7 +916,7 @@ static const struct net_device_ops fs_enet_netdev_ops = {
#endif
};
static struct of_device_id fs_enet_match[];
static const struct of_device_id fs_enet_match[];
static int fs_enet_probe(struct platform_device *ofdev)
{
const struct of_device_id *match;
@ -1082,7 +1082,7 @@ static int fs_enet_remove(struct platform_device *ofdev)
return 0;
}
static struct of_device_id fs_enet_match[] = {
static const struct of_device_id fs_enet_match[] = {
#ifdef CONFIG_FS_ENET_HAS_SCC
{
.compatible = "fsl,cpm1-scc-enet",

2
drivers/net/ethernet/freescale/fs_enet/mii-bitbang.c
View File

@ -213,7 +213,7 @@ static int fs_enet_mdio_remove(struct platform_device *ofdev)
return 0;
}
static struct of_device_id fs_enet_mdio_bb_match[] = {
static const struct of_device_id fs_enet_mdio_bb_match[] = {
{
.compatible = "fsl,cpm2-mdio-bitbang",
},

4
drivers/net/ethernet/freescale/fs_enet/mii-fec.c
View File

@ -95,7 +95,7 @@ static int fs_enet_fec_mii_write(struct mii_bus *bus, int phy_id, int location,
}
static struct of_device_id fs_enet_mdio_fec_match[];
static const struct of_device_id fs_enet_mdio_fec_match[];
static int fs_enet_mdio_probe(struct platform_device *ofdev)
{
const struct of_device_id *match;
@ -208,7 +208,7 @@ static int fs_enet_mdio_remove(struct platform_device *ofdev)
return 0;
}
static struct of_device_id fs_enet_mdio_fec_match[] = {
static const struct of_device_id fs_enet_mdio_fec_match[] = {
{
.compatible = "fsl,pq1-fec-mdio",
},

2
drivers/net/ethernet/freescale/fsl_pq_mdio.c
View File

@ -294,7 +294,7 @@ static void ucc_configure(phys_addr_t start, phys_addr_t end)
#endif
static struct of_device_id fsl_pq_mdio_match[] = {
static const struct of_device_id fsl_pq_mdio_match[] = {
#if defined(CONFIG_GIANFAR) || defined(CONFIG_GIANFAR_MODULE)
{
.compatible = "fsl,gianfar-tbi",

2
drivers/net/ethernet/freescale/gianfar.c
View File

@ -3594,7 +3594,7 @@ static noinline void gfar_update_link_state(struct gfar_private *priv)
phy_print_status(phydev);
}
static struct of_device_id gfar_match[] =
static const struct of_device_id gfar_match[] =
{
{
.type = "network",

2
drivers/net/ethernet/freescale/gianfar_ptp.c
View File

@ -554,7 +554,7 @@ static int gianfar_ptp_remove(struct platform_device *dev)
return 0;
}
static struct of_device_id match_table[] = {
static const struct of_device_id match_table[] = {
{ .compatible = "fsl,etsec-ptp" },
{},
};

2
drivers/net/ethernet/freescale/ucc_geth.c
View File

@ -3930,7 +3930,7 @@ static int ucc_geth_remove(struct platform_device* ofdev)
return 0;
}
static struct of_device_id ucc_geth_match[] = {
static const struct of_device_id ucc_geth_match[] = {
{
.type = "network",
.compatible = "ucc_geth",

2
drivers/net/ethernet/freescale/xgmac_mdio.c
View File

@ -307,7 +307,7 @@ static int xgmac_mdio_remove(struct platform_device *pdev)
return 0;
}
static struct of_device_id xgmac_mdio_match[] = {
static const struct of_device_id xgmac_mdio_match[] = {
{
.compatible = "fsl,fman-xmdio",
},

4
drivers/net/ethernet/ibm/ehea/ehea_main.c
View File

@ -103,7 +103,7 @@ static int ehea_probe_adapter(struct platform_device *dev);
static int ehea_remove(struct platform_device *dev);
static struct of_device_id ehea_module_device_table[] = {
static const struct of_device_id ehea_module_device_table[] = {
{
.name = "lhea",
.compatible = "IBM,lhea",
@ -116,7 +116,7 @@ static struct of_device_id ehea_module_device_table[] = {
};
MODULE_DEVICE_TABLE(of, ehea_module_device_table);
static struct of_device_id ehea_device_table[] = {
static const struct of_device_id ehea_device_table[] = {
{
.name = "lhea",
.compatible = "IBM,lhea",

2
drivers/net/ethernet/ibm/emac/core.c
View File

@ -2981,7 +2981,7 @@ static int emac_remove(struct platform_device *ofdev)
}
/* XXX Features in here should be replaced by properties... */
static struct of_device_id emac_match[] =
static const struct of_device_id emac_match[] =
{
{
.type = "network",

2
drivers/net/ethernet/ibm/emac/mal.c
View File

@ -753,7 +753,7 @@ static int mal_remove(struct platform_device *ofdev)
return 0;
}
static struct of_device_id mal_platform_match[] =
static const struct of_device_id mal_platform_match[] =
{
{
.compatible = "ibm,mcmal",

2
drivers/net/ethernet/ibm/emac/rgmii.c
View File

@ -305,7 +305,7 @@ static int rgmii_remove(struct platform_device *ofdev)
return 0;
}
static struct of_device_id rgmii_match[] =
static const struct of_device_id rgmii_match[] =
{
{
.compatible = "ibm,rgmii",

2
drivers/net/ethernet/ibm/emac/tah.c
View File

@ -148,7 +148,7 @@ static int tah_remove(struct platform_device *ofdev)
return 0;
}
static struct of_device_id tah_match[] =
static const struct of_device_id tah_match[] =
{
{
.compatible = "ibm,tah",

2
drivers/net/ethernet/ibm/emac/zmii.c
View File

@ -295,7 +295,7 @@ static int zmii_remove(struct platform_device *ofdev)
return 0;
}
static struct of_device_id zmii_match[] =
static const struct of_device_id zmii_match[] =
{
{
.compatible = "ibm,zmii",

2
drivers/net/ethernet/octeon/octeon_mgmt.c
View File

@ -1557,7 +1557,7 @@ static int octeon_mgmt_remove(struct platform_device *pdev)
return 0;
}
static struct of_device_id octeon_mgmt_match[] = {
static const struct of_device_id octeon_mgmt_match[] = {
{
.compatible = "cavium,octeon-5750-mix",
},

2
drivers/net/ethernet/ti/netcp_core.c
View File

@ -2127,7 +2127,7 @@ static int netcp_remove(struct platform_device *pdev)
return 0;
}
static struct of_device_id of_match[] = {
static const struct of_device_id of_match[] = {
{ .compatible = "ti,netcp-1.0", },
{},
};

2
drivers/net/ethernet/via/via-rhine.c
View File

@ -288,7 +288,7 @@ MODULE_DEVICE_TABLE(pci, rhine_pci_tbl);
* The .data field is currently only used to store quirks
*/
static u32 vt8500_quirks = rqWOL | rqForceReset | rq6patterns;
static struct of_device_id rhine_of_tbl[] = {
static const struct of_device_id rhine_of_tbl[] = {
{ .compatible = "via,vt8500-rhine", .data = &vt8500_quirks },
{ } /* terminate list */
};

2
drivers/net/ethernet/via/via-velocity.c
View File

@ -392,7 +392,7 @@ MODULE_DEVICE_TABLE(pci, velocity_pci_id_table);
* Describe the OF device identifiers that we support in this
* device driver. Used for devicetree nodes.
*/
static struct of_device_id velocity_of_ids[] = {
static const struct of_device_id velocity_of_ids[] = {
{ .compatible = "via,velocity-vt6110", .data = &chip_info_table[0] },
{ /* Sentinel */ },
};

2
drivers/net/ethernet/xilinx/ll_temac_main.c
View File

@ -1157,7 +1157,7 @@ static int temac_of_remove(struct platform_device *op)
return 0;
}
static struct of_device_id temac_of_match[] = {
static const struct of_device_id temac_of_match[] = {
{ .compatible = "xlnx,xps-ll-temac-1.01.b", },
{ .compatible = "xlnx,xps-ll-temac-2.00.a", },
{ .compatible = "xlnx,xps-ll-temac-2.02.a", },

2
drivers/net/ethernet/xilinx/xilinx_axienet_main.c
View File

@ -48,7 +48,7 @@
#define AXIENET_REGS_N 32
/* Match table for of_platform binding */
static struct of_device_id axienet_of_match[] = {
static const struct of_device_id axienet_of_match[] = {
{ .compatible = "xlnx,axi-ethernet-1.00.a", },
{ .compatible = "xlnx,axi-ethernet-1.01.a", },
{ .compatible = "xlnx,axi-ethernet-2.01.a", },

2
drivers/net/ethernet/xilinx/xilinx_emaclite.c
View File

@ -1231,7 +1231,7 @@ static struct net_device_ops xemaclite_netdev_ops = {
};
/* Match table for OF platform binding */
static struct of_device_id xemaclite_of_match[] = {
static const struct of_device_id xemaclite_of_match[] = {
{ .compatible = "xlnx,opb-ethernetlite-1.01.a", },
{ .compatible = "xlnx,opb-ethernetlite-1.01.b", },
{ .compatible = "xlnx,xps-ethernetlite-1.00.a", },

2
drivers/net/phy/mdio-bcm-unimac.c
View File

@ -187,7 +187,7 @@ static int unimac_mdio_remove(struct platform_device *pdev)
return 0;
}
static struct of_device_id unimac_mdio_ids[] = {
static const struct of_device_id unimac_mdio_ids[] = {
{ .compatible = "brcm,genet-mdio-v4", },
{ .compatible = "brcm,genet-mdio-v3", },
{ .compatible = "brcm,genet-mdio-v2", },

2
drivers/net/phy/mdio-gpio.c
View File

@ -249,7 +249,7 @@ static int mdio_gpio_remove(struct platform_device *pdev)
return 0;
}
static struct of_device_id mdio_gpio_of_match[] = {
static const struct of_device_id mdio_gpio_of_match[] = {
{ .compatible = "virtual,mdio-gpio", },
{ /* sentinel */ }
};

2
drivers/net/phy/mdio-mux-gpio.c
View File

@ -99,7 +99,7 @@ static int mdio_mux_gpio_remove(struct platform_device *pdev)
return 0;
}
static struct of_device_id mdio_mux_gpio_match[] = {
static const struct of_device_id mdio_mux_gpio_match[] = {
{
.compatible = "mdio-mux-gpio",
},

2
drivers/net/phy/mdio-mux-mmioreg.c
View File

@ -145,7 +145,7 @@ static int mdio_mux_mmioreg_remove(struct platform_device *pdev)
return 0;
}
static struct of_device_id mdio_mux_mmioreg_match[] = {
static const struct of_device_id mdio_mux_mmioreg_match[] = {
{
.compatible = "mdio-mux-mmioreg",
},

2
drivers/net/phy/mdio-octeon.c
View File

@ -252,7 +252,7 @@ static int octeon_mdiobus_remove(struct platform_device *pdev)
return 0;
}
static struct of_device_id octeon_mdiobus_match[] = {
static const struct of_device_id octeon_mdiobus_match[] = {
{
.compatible = "cavium,octeon-3860-mdio",
},

2
drivers/net/wireless/orinoco/airport.c
View File

@ -228,7 +228,7 @@ MODULE_AUTHOR("Benjamin Herrenschmidt <benh@kernel.crashing.org>");
MODULE_DESCRIPTION("Driver for the Apple Airport wireless card.");
MODULE_LICENSE("Dual MPL/GPL");
static struct of_device_id airport_match[] = {
static const struct of_device_id airport_match[] = {
{
.name = "radio",
},