diff options
author | Arvind Yadav <arvind.yadav.cs@gmail.com> | 2017-08-03 19:20:17 -0400 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2017-08-10 16:21:42 -0400 |
commit | 8394264da2bc04a75d7d02071ae2ba6adbd46361 (patch) | |
tree | e1ddef0f09fa8ba690ded83ef8590a99d0a53bd2 /drivers/pci | |
parent | 4bd3256c359d54643f9604fa267b292c006c266f (diff) |
PCI: Constify hotplug pci_device_id structures
pci_device_id are not supposed to change at runtime. All functions working
with pci_device_id provided by <linux/pci.h> work with const pci_device_id.
So mark the non-const structs as const.
Signed-off-by: Arvind Yadav <arvind.yadav.cs@gmail.com>
[bhelgaas: squash shpchp, ibmphp, bmphp_ebda, cpcihp_zt5550, cpqphp]
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Diffstat (limited to 'drivers/pci')
-rw-r--r-- | drivers/pci/hotplug/cpcihp_zt5550.c | 2 | ||||
-rw-r--r-- | drivers/pci/hotplug/cpqphp_core.c | 2 | ||||
-rw-r--r-- | drivers/pci/hotplug/ibmphp_core.c | 2 | ||||
-rw-r--r-- | drivers/pci/hotplug/ibmphp_ebda.c | 2 | ||||
-rw-r--r-- | drivers/pci/hotplug/shpchp_core.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/drivers/pci/hotplug/cpcihp_zt5550.c b/drivers/pci/hotplug/cpcihp_zt5550.c index 5f49c3fd736a..2f8659a148f5 100644 --- a/drivers/pci/hotplug/cpcihp_zt5550.c +++ b/drivers/pci/hotplug/cpcihp_zt5550.c | |||
@@ -280,7 +280,7 @@ static void zt5550_hc_remove_one(struct pci_dev *pdev) | |||
280 | } | 280 | } |
281 | 281 | ||
282 | 282 | ||
283 | static struct pci_device_id zt5550_hc_pci_tbl[] = { | 283 | static const struct pci_device_id zt5550_hc_pci_tbl[] = { |
284 | { PCI_VENDOR_ID_ZIATECH, PCI_DEVICE_ID_ZIATECH_5550_HC, PCI_ANY_ID, PCI_ANY_ID, }, | 284 | { PCI_VENDOR_ID_ZIATECH, PCI_DEVICE_ID_ZIATECH_5550_HC, PCI_ANY_ID, PCI_ANY_ID, }, |
285 | { 0, } | 285 | { 0, } |
286 | }; | 286 | }; |
diff --git a/drivers/pci/hotplug/cpqphp_core.c b/drivers/pci/hotplug/cpqphp_core.c index 33d300d12411..4d06b8461255 100644 --- a/drivers/pci/hotplug/cpqphp_core.c +++ b/drivers/pci/hotplug/cpqphp_core.c | |||
@@ -1417,7 +1417,7 @@ static void __exit unload_cpqphpd(void) | |||
1417 | iounmap(smbios_start); | 1417 | iounmap(smbios_start); |
1418 | } | 1418 | } |
1419 | 1419 | ||
1420 | static struct pci_device_id hpcd_pci_tbl[] = { | 1420 | static const struct pci_device_id hpcd_pci_tbl[] = { |
1421 | { | 1421 | { |
1422 | /* handle any PCI Hotplug controller */ | 1422 | /* handle any PCI Hotplug controller */ |
1423 | .class = ((PCI_CLASS_SYSTEM_PCI_HOTPLUG << 8) | 0x00), | 1423 | .class = ((PCI_CLASS_SYSTEM_PCI_HOTPLUG << 8) | 0x00), |
diff --git a/drivers/pci/hotplug/ibmphp_core.c b/drivers/pci/hotplug/ibmphp_core.c index 5efd01d84498..73cf84645c82 100644 --- a/drivers/pci/hotplug/ibmphp_core.c +++ b/drivers/pci/hotplug/ibmphp_core.c | |||
@@ -852,7 +852,7 @@ static int set_bus(struct slot *slot_cur) | |||
852 | u8 speed; | 852 | u8 speed; |
853 | u8 cmd = 0x0; | 853 | u8 cmd = 0x0; |
854 | int retval; | 854 | int retval; |
855 | static struct pci_device_id ciobx[] = { | 855 | static const struct pci_device_id ciobx[] = { |
856 | { PCI_DEVICE(PCI_VENDOR_ID_SERVERWORKS, 0x0101) }, | 856 | { PCI_DEVICE(PCI_VENDOR_ID_SERVERWORKS, 0x0101) }, |
857 | { }, | 857 | { }, |
858 | }; | 858 | }; |
diff --git a/drivers/pci/hotplug/ibmphp_ebda.c b/drivers/pci/hotplug/ibmphp_ebda.c index 43e345ac296b..a6a4dac798e5 100644 --- a/drivers/pci/hotplug/ibmphp_ebda.c +++ b/drivers/pci/hotplug/ibmphp_ebda.c | |||
@@ -1153,7 +1153,7 @@ void ibmphp_free_ebda_pci_rsrc_queue(void) | |||
1153 | } | 1153 | } |
1154 | } | 1154 | } |
1155 | 1155 | ||
1156 | static struct pci_device_id id_table[] = { | 1156 | static const struct pci_device_id id_table[] = { |
1157 | { | 1157 | { |
1158 | .vendor = PCI_VENDOR_ID_IBM, | 1158 | .vendor = PCI_VENDOR_ID_IBM, |
1159 | .device = HPC_DEVICE_ID, | 1159 | .device = HPC_DEVICE_ID, |
diff --git a/drivers/pci/hotplug/shpchp_core.c b/drivers/pci/hotplug/shpchp_core.c index 3454dc7385f1..7bfb87bd2b7e 100644 --- a/drivers/pci/hotplug/shpchp_core.c +++ b/drivers/pci/hotplug/shpchp_core.c | |||
@@ -351,7 +351,7 @@ static void shpc_remove(struct pci_dev *dev) | |||
351 | kfree(ctrl); | 351 | kfree(ctrl); |
352 | } | 352 | } |
353 | 353 | ||
354 | static struct pci_device_id shpcd_pci_tbl[] = { | 354 | static const struct pci_device_id shpcd_pci_tbl[] = { |
355 | {PCI_DEVICE_CLASS(((PCI_CLASS_BRIDGE_PCI << 8) | 0x00), ~0)}, | 355 | {PCI_DEVICE_CLASS(((PCI_CLASS_BRIDGE_PCI << 8) | 0x00), ~0)}, |
356 | { /* end: all zeroes */ } | 356 | { /* end: all zeroes */ } |
357 | }; | 357 | }; |