Merge branch 'net-const-eisa_device_id'
Arvind Yadav says: ==================== constify net eisa_device_id eisa_device_id are not supposed to change at runtime. All functions working with eisa_device_id provided by <linux/eisa.h> work with const eisa_device_id. So mark the non-const structs as const. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
commit
91558e76c8
@ -474,7 +474,7 @@ static int pnp_registered;
|
||||
#endif /* CONFIG_PNP */
|
||||
|
||||
#ifdef CONFIG_EISA
|
||||
static struct eisa_device_id el3_eisa_ids[] = {
|
||||
static const struct eisa_device_id el3_eisa_ids[] = {
|
||||
{ "TCM5090" },
|
||||
{ "TCM5091" },
|
||||
{ "TCM5092" },
|
||||
|
@ -900,7 +900,7 @@ static const struct dev_pm_ops vortex_pm_ops = {
|
||||
#endif /* !CONFIG_PM */
|
||||
|
||||
#ifdef CONFIG_EISA
|
||||
static struct eisa_device_id vortex_eisa_ids[] = {
|
||||
static const struct eisa_device_id vortex_eisa_ids[] = {
|
||||
{ "TCM5920", CH_3C592 },
|
||||
{ "TCM5970", CH_3C597 },
|
||||
{ "" }
|
||||
|
@ -2094,7 +2094,7 @@ static int de4x5_eisa_remove(struct device *device)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static struct eisa_device_id de4x5_eisa_ids[] = {
|
||||
static const struct eisa_device_id de4x5_eisa_ids[] = {
|
||||
{ "DEC4250", 0 }, /* 0 is the board name index... */
|
||||
{ "" }
|
||||
};
|
||||
|
@ -194,7 +194,7 @@ static const char *hp100_isa_tbl[] = {
|
||||
};
|
||||
#endif
|
||||
|
||||
static struct eisa_device_id hp100_eisa_tbl[] = {
|
||||
static const struct eisa_device_id hp100_eisa_tbl[] = {
|
||||
{ "HWPF180" }, /* HP J2577 rev A */
|
||||
{ "HWP1920" }, /* HP 27248B */
|
||||
{ "HWP1940" }, /* HP J2577 */
|
||||
|
@ -3767,7 +3767,7 @@ static void dfx_pci_unregister(struct pci_dev *pdev)
|
||||
#endif /* CONFIG_PCI */
|
||||
|
||||
#ifdef CONFIG_EISA
|
||||
static struct eisa_device_id dfx_eisa_table[] = {
|
||||
static const struct eisa_device_id dfx_eisa_table[] = {
|
||||
{ "DEC3001", DEFEA_PROD_ID_1 },
|
||||
{ "DEC3002", DEFEA_PROD_ID_2 },
|
||||
{ "DEC3003", DEFEA_PROD_ID_3 },
|
||||
|
Loading…
Reference in New Issue
Block a user