Merging upstream version 1:3.12.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 11 insertions, 13 deletions

diff --git a/lib/dump.c b/lib/dump.c
index 829071f..5f4ba2e 100644
--- a/lib/dump.c
+++ b/lib/dump.c
@@ -178,17 +178,15 @@ dump_cleanup_dev(struct pci_dev *d)
 }
 
 struct pci_methods pm_dump = {
-  "dump",
-  "Reading of register dumps (set the `dump.name' parameter)",
-  dump_config,
-  dump_detect,
-  dump_init,
-  dump_cleanup,
-  dump_scan,
-  pci_generic_fill_info,
-  dump_read,
-  dump_write,
-  NULL,					/* read_vpd */
-  NULL,					/* init_dev */
-  dump_cleanup_dev
+  .name = "dump",
+  .help = "Reading of register dumps (set the `dump.name' parameter)",
+  .config = dump_config,
+  .detect = dump_detect,
+  .init = dump_init,
+  .cleanup = dump_cleanup,
+  .scan = dump_scan,
+  .fill_info = pci_generic_fill_info,
+  .read = dump_read,
+  .write = dump_write,
+  .cleanup_dev = dump_cleanup_dev,
 };