Use C99 named initializers for struct pci_methods

17 files changed, 192 insertions, 247 deletions

diff --git a/lib/aix-device.c b/lib/aix-device.c
index 028d92a..ac95b81 100644
--- a/lib/aix-device.c
+++ b/lib/aix-device.c
@@ -260,17 +260,13 @@ aix_write(struct pci_dev *d, int pos, byte *buf, int len)
 }
 
 struct pci_methods pm_aix_device = {
-  "aix-device",
-  "AIX /dev/pci[0-n]",
-  NULL,
-  aix_detect,
-  aix_init,
-  aix_cleanup,
-  aix_scan,
-  pci_generic_fill_info,
-  aix_read,
-  aix_write,
-  NULL,                                 /* read_vpd */
-  NULL,                                 /* dev_init */
-  NULL                                  /* dev_cleanup */
+  .name = "aix-device",
+  .help = "AIX /dev/pci[0-n]",
+  .detect = aix_detect,
+  .init = aix_init,
+  .cleanup = aix_cleanup,
+  .scan = aix_scan,
+  .fill_info = pci_generic_fill_info,
+  .read = aix_read,
+  .write = aix_write,
 };
diff --git a/lib/aos-expansion.c b/lib/aos-expansion.c
index 3e11f47..e36358e 100644
--- a/lib/aos-expansion.c
+++ b/lib/aos-expansion.c
@@ -221,17 +221,15 @@ aos_expansion_cleanup_dev(struct pci_dev *d)
 }
 
 struct pci_methods pm_aos_expansion = {
-	"aos-expansion",
-	"The Expansion.library on AmigaOS 4.x",
-	NULL,			// config, called after allocation of pci_access, if assigned
-	aos_expansion_detect,	// detect, mandatory because called without check
-	aos_expansion_init,	// init, called once access chosen, eventually after detect
-	aos_expansion_cleanup,	// cleanup, called at the end
-	aos_expansion_scan,
-	pci_generic_fill_info,
-	aos_expansion_read,
-	aos_expansion_write,
-	NULL,			// read_vpd
-	aos_expansion_init_dev,
-	aos_expansion_cleanup_dev,
+	.name = "aos-expansion",
+	.help = "The Expansion.library on AmigaOS 4.x",
+	.detect = aos_expansion_detect,		// detect, mandatory because called without check
+	.init = aos_expansion_init,		// init, called once access chosen, eventually after detect
+	.cleanup = aos_expansion_cleanup,	// cleanup, called at the end
+	.scan = aos_expansion_scan,
+	.fill_info = pci_generic_fill_info,
+	.read = aos_expansion_read,
+	.write = aos_expansion_write,
+	.init_dev = aos_expansion_init_dev,
+	.cleanup_dev = aos_expansion_cleanup_dev,
 };
diff --git a/lib/darwin.c b/lib/darwin.c
index 8ae9008..df5032e 100644
--- a/lib/darwin.c
+++ b/lib/darwin.c
@@ -197,17 +197,14 @@ darwin_write(struct pci_dev *d, int pos, byte *buf, int len)
 }
 
 struct pci_methods pm_darwin = {
-    "darwin",
-    "Darwin",
-    darwin_config,
-    darwin_detect,
-    darwin_init,
-    darwin_cleanup,
-    pci_generic_scan,
-    pci_generic_fill_info,
-    darwin_read,
-    darwin_write,
-    NULL,                                 /* read_vpd */
-    NULL,                                 /* dev_init */
-    NULL                                  /* dev_cleanup */
+    .name = "darwin",
+    .help = "Darwin",
+    .config = darwin_config,
+    .detect = darwin_detect,
+    .init = darwin_init,
+    .cleanup = darwin_cleanup,
+    .scan = pci_generic_scan,
+    .fill_info = pci_generic_fill_info,
+    .read = darwin_read,
+    .write = darwin_write,
 };
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,
 };
diff --git a/lib/ecam.c b/lib/ecam.c
index f088c0c..7f73d51 100644
--- a/lib/ecam.c
+++ b/lib/ecam.c
@@ -1088,17 +1088,14 @@ ecam_write(struct pci_dev *d, int pos, byte *buf, int len)
 }
 
 struct pci_methods pm_ecam = {
-  "ecam",
-  "Raw memory mapped access using PCIe ECAM interface",
-  ecam_config,
-  ecam_detect,
-  ecam_init,
-  ecam_cleanup,
-  ecam_scan,
-  pci_generic_fill_info,
-  ecam_read,
-  ecam_write,
-  NULL,					/* read_vpd */
-  NULL,					/* init_dev */
-  NULL					/* cleanup_dev */
+  .name = "ecam",
+  .help = "Raw memory mapped access using PCIe ECAM interface",
+  .config = ecam_config,
+  .detect = ecam_detect,
+  .init = ecam_init,
+  .cleanup = ecam_cleanup,
+  .scan = ecam_scan,
+  .fill_info = pci_generic_fill_info,
+  .read = ecam_read,
+  .write = ecam_write,
 };
diff --git a/lib/fbsd-device.c b/lib/fbsd-device.c
index 2ea5e84..36857d6 100644
--- a/lib/fbsd-device.c
+++ b/lib/fbsd-device.c
@@ -350,17 +350,14 @@ fbsd_write(struct pci_dev *d, int pos, byte *buf, int len)
 }
 
 struct pci_methods pm_fbsd_device = {
-  "fbsd-device",
-  "FreeBSD /dev/pci device",
-  fbsd_config,
-  fbsd_detect,
-  fbsd_init,
-  fbsd_cleanup,
-  fbsd_scan,
-  fbsd_fill_info,
-  fbsd_read,
-  fbsd_write,
-  NULL,                                 /* read_vpd */
-  NULL,                                 /* dev_init */
-  NULL                                  /* dev_cleanup */
+  .name = "fbsd-device",
+  .help = "FreeBSD /dev/pci device",
+  .config = fbsd_config,
+  .detect = fbsd_detect,
+  .init = fbsd_init,
+  .cleanup = fbsd_cleanup,
+  .scan = fbsd_scan,
+  .fill_info = fbsd_fill_info,
+  .read = fbsd_read,
+  .write = fbsd_write,
 };
diff --git a/lib/hurd.c b/lib/hurd.c
index 3e65fb8..84860a7 100644
--- a/lib/hurd.c
+++ b/lib/hurd.c
@@ -356,17 +356,15 @@ hurd_fill_info(struct pci_dev *d, unsigned int flags)
 }
 
 struct pci_methods pm_hurd = {
-  "hurd",
-  "Hurd access using RPCs",
-  NULL,				/* config */
-  hurd_detect,
-  hurd_init,
-  hurd_cleanup,
-  hurd_scan,
-  hurd_fill_info,
-  hurd_read,
-  hurd_write,
-  NULL,				/* read_vpd */
-  hurd_init_dev,
-  hurd_cleanup_dev
+  .name = "hurd",
+  .help = "Hurd access using RPCs",
+  .detect = hurd_detect,
+  .init = hurd_init,
+  .cleanup = hurd_cleanup,
+  .scan = hurd_scan,
+  .fill_info = hurd_fill_info,
+  .read = hurd_read,
+  .write = hurd_write,
+  .init_dev = hurd_init_dev,
+  .cleanup_dev = hurd_cleanup_dev
 };
diff --git a/lib/i386-ports.c b/lib/i386-ports.c
index 5f8aea4..b9d863c 100644
--- a/lib/i386-ports.c
+++ b/lib/i386-ports.c
@@ -295,33 +295,25 @@ conf2_write(struct pci_dev *d, int pos, byte *buf, int len)
 }
 
 struct pci_methods pm_intel_conf1 = {
-  "intel-conf1",
-  "Raw I/O port access using Intel conf1 interface",
-  NULL,					/* config */
-  conf1_detect,
-  conf12_init,
-  conf12_cleanup,
-  pci_generic_scan,
-  pci_generic_fill_info,
-  conf1_read,
-  conf1_write,
-  NULL,					/* read_vpd */
-  NULL,					/* init_dev */
-  NULL					/* cleanup_dev */
+  .name = "intel-conf1",
+  .help = "Raw I/O port access using Intel conf1 interface",
+  .detect = conf1_detect,
+  .init = conf12_init,
+  .cleanup = conf12_cleanup,
+  .scan = pci_generic_scan,
+  .fill_info = pci_generic_fill_info,
+  .read = conf1_read,
+  .write = conf1_write,
 };
 
 struct pci_methods pm_intel_conf2 = {
-  "intel-conf2",
-  "Raw I/O port access using Intel conf2 interface",
-  NULL,					/* config */
-  conf2_detect,
-  conf12_init,
-  conf12_cleanup,
-  pci_generic_scan,
-  pci_generic_fill_info,
-  conf2_read,
-  conf2_write,
-  NULL,					/* read_vpd */
-  NULL,					/* init_dev */
-  NULL					/* cleanup_dev */
+  .name = "intel-conf2",
+  .help = "Raw I/O port access using Intel conf2 interface",
+  .detect = conf2_detect,
+  .init = conf12_init,
+  .cleanup = conf12_cleanup,
+  .scan = pci_generic_scan,
+  .fill_info = pci_generic_fill_info,
+  .read = conf2_read,
+  .write = conf2_write,
 };
diff --git a/lib/mmio-ports.c b/lib/mmio-ports.c
index cac8a7e..00a595a 100644
--- a/lib/mmio-ports.c
+++ b/lib/mmio-ports.c
@@ -400,33 +400,27 @@ conf1_write(struct pci_dev *d, int pos, byte *buf, int len)
 }
 
 struct pci_methods pm_mmio_conf1 = {
-  "mmio-conf1",
-  "Raw memory mapped I/O port access using Intel conf1 interface",
-  conf1_config,
-  conf1_detect,
-  conf1_init,
-  conf1_cleanup,
-  conf1_scan,
-  pci_generic_fill_info,
-  conf1_read,
-  conf1_write,
-  NULL,					/* read_vpd */
-  NULL,					/* init_dev */
-  NULL					/* cleanup_dev */
+  .name = "mmio-conf1",
+  .help = "Raw memory mapped I/O port access using Intel conf1 interface",
+  .config = conf1_config,
+  .detect = conf1_detect,
+  .init = conf1_init,
+  .cleanup = conf1_cleanup,
+  .scan = conf1_scan,
+  .fill_info = pci_generic_fill_info,
+  .read = conf1_read,
+  .write = conf1_write,
 };
 
 struct pci_methods pm_mmio_conf1_ext = {
-  "mmio-conf1-ext",
-  "Raw memory mapped I/O port access using Intel conf1 extended interface",
-  conf1_ext_config,
-  conf1_ext_detect,
-  conf1_init,
-  conf1_cleanup,
-  conf1_scan,
-  pci_generic_fill_info,
-  conf1_ext_read,
-  conf1_ext_write,
-  NULL,					/* read_vpd */
-  NULL,					/* init_dev */
-  NULL					/* cleanup_dev */
+  .name = "mmio-conf1-ext",
+  .help = "Raw memory mapped I/O port access using Intel conf1 extended interface",
+  .config = conf1_ext_config,
+  .detect = conf1_ext_detect,
+  .init = conf1_init,
+  .cleanup = conf1_cleanup,
+  .scan = conf1_scan,
+  .fill_info = pci_generic_fill_info,
+  .read = conf1_ext_read,
+  .write = conf1_ext_write,
 };
diff --git a/lib/nbsd-libpci.c b/lib/nbsd-libpci.c
index 0f9f27b..e84ac6b 100644
--- a/lib/nbsd-libpci.c
+++ b/lib/nbsd-libpci.c
@@ -143,17 +143,14 @@ nbsd_write(struct pci_dev *d, int pos, byte *buf, int len)
 }
 
 struct pci_methods pm_nbsd_libpci = {
-  "nbsd-libpci",
-  "NetBSD libpci",
-  nbsd_config,
-  nbsd_detect,
-  nbsd_init,
-  nbsd_cleanup,
-  pci_generic_scan,
-  pci_generic_fill_info,
-  nbsd_read,
-  nbsd_write,
-  NULL,                                 /* read_vpd */
-  NULL,                                 /* dev_init */
-  NULL                                  /* dev_cleanup */
+  .name = "nbsd-libpci",
+  .help = "NetBSD libpci",
+  .config = nbsd_config,
+  .detect = nbsd_detect,
+  .init = nbsd_init,
+  .cleanup = nbsd_cleanup,
+  .scan = pci_generic_scan,
+  .fill_info = pci_generic_fill_info,
+  .read = nbsd_read,
+  .write = nbsd_write,
 };
diff --git a/lib/obsd-device.c b/lib/obsd-device.c
index e2e7652..41f16ce 100644
--- a/lib/obsd-device.c
+++ b/lib/obsd-device.c
@@ -138,17 +138,14 @@ obsd_write(struct pci_dev *d, int pos, byte *buf, int len)
 }
 
 struct pci_methods pm_obsd_device = {
-  "obsd-device",
-  "/dev/pci on OpenBSD",
-  obsd_config,
-  obsd_detect,
-  obsd_init,
-  obsd_cleanup,
-  pci_generic_scan,
-  pci_generic_fill_info,
-  obsd_read,
-  obsd_write,
-  NULL,                                 /* read_vpd */
-  NULL,                                 /* dev_init */
-  NULL                                  /* dev_cleanup */
+  .name = "obsd-device",
+  .help = "/dev/pci on OpenBSD",
+  .config = obsd_config,
+  .detect = obsd_detect,
+  .init = obsd_init,
+  .cleanup = obsd_cleanup,
+  .scan = pci_generic_scan,
+  .fill_info = pci_generic_fill_info,
+  .read = obsd_read,
+  .write = obsd_write,
 };
diff --git a/lib/proc.c b/lib/proc.c
index 429cea6..deba651 100644
--- a/lib/proc.c
+++ b/lib/proc.c
@@ -214,17 +214,15 @@ proc_cleanup_dev(struct pci_dev *d)
 }
 
 struct pci_methods pm_linux_proc = {
-  "linux-proc",
-  "The proc file system on Linux",
-  proc_config,
-  proc_detect,
-  proc_init,
-  proc_cleanup,
-  proc_scan,
-  pci_generic_fill_info,
-  proc_read,
-  proc_write,
-  NULL,					/* read_vpd */
-  NULL,					/* init_dev */
-  proc_cleanup_dev
+  .name = "linux-proc",
+  .help = "The proc file system on Linux",
+  .config = proc_config,
+  .detect = proc_detect,
+  .init = proc_init,
+  .cleanup = proc_cleanup,
+  .scan = proc_scan,
+  .fill_info = pci_generic_fill_info,
+  .read = proc_read,
+  .write = proc_write,
+  .cleanup_dev = proc_cleanup_dev,
 };
diff --git a/lib/sylixos-device.c b/lib/sylixos-device.c
index 170ae02..9addcbf 100644
--- a/lib/sylixos-device.c
+++ b/lib/sylixos-device.c
@@ -144,17 +144,14 @@ sylixos_write(struct pci_dev *d, int pos, byte *buf, int len)
 }
 
 struct pci_methods pm_sylixos_device = {
-  "sylixos-device",
-  "SylixOS /proc/pci device",
-  sylixos_config,
-  sylixos_detect,
-  sylixos_init,
-  sylixos_cleanup,
-  sylixos_scan,
-  pci_generic_fill_info,
-  sylixos_read,
-  sylixos_write,
-  NULL,			// no read_vpd
-  NULL,			// no init_dev
-  NULL,			// no cleanup_dev
+  .name = "sylixos-device",
+  .help = "SylixOS /proc/pci device",
+  .config = sylixos_config,
+  .detect = sylixos_detect,
+  .init = sylixos_init,
+  .cleanup = sylixos_cleanup,
+  .scan = sylixos_scan,
+  .fill_info = pci_generic_fill_info,
+  .read = sylixos_read,
+  .write = sylixos_write,
 };
diff --git a/lib/sysfs.c b/lib/sysfs.c
index 48ed6da..0e763dc 100644
--- a/lib/sysfs.c
+++ b/lib/sysfs.c
@@ -594,17 +594,16 @@ static void sysfs_cleanup_dev(struct pci_dev *d)
 }
 
 struct pci_methods pm_linux_sysfs = {
-  "linux-sysfs",
-  "The sys filesystem on Linux",
-  sysfs_config,
-  sysfs_detect,
-  sysfs_init,
-  sysfs_cleanup,
-  sysfs_scan,
-  sysfs_fill_info,
-  sysfs_read,
-  sysfs_write,
-  sysfs_read_vpd,
-  NULL,					/* init_dev */
-  sysfs_cleanup_dev
+  .name = "linux-sysfs",
+  .help = "The sys filesystem on Linux",
+  .config = sysfs_config,
+  .detect = sysfs_detect,
+  .init = sysfs_init,
+  .cleanup = sysfs_cleanup,
+  .scan = sysfs_scan,
+  .fill_info = sysfs_fill_info,
+  .read = sysfs_read,
+  .write = sysfs_write,
+  .read_vpd = sysfs_read_vpd,
+  .cleanup_dev = sysfs_cleanup_dev,
 };
diff --git a/lib/win32-cfgmgr32.c b/lib/win32-cfgmgr32.c
index dbddc54..ab9042d 100644
--- a/lib/win32-cfgmgr32.c
+++ b/lib/win32-cfgmgr32.c
@@ -1749,17 +1749,15 @@ win32_cfgmgr32_cleanup(struct pci_access *a)
 }
 
 struct pci_methods pm_win32_cfgmgr32 = {
-  "win32-cfgmgr32",
-  "Win32 device listing via Configuration Manager",
-  win32_cfgmgr32_config,
-  win32_cfgmgr32_detect,
-  win32_cfgmgr32_init,
-  win32_cfgmgr32_cleanup,
-  win32_cfgmgr32_scan,
-  win32_cfgmgr32_fill_info,
-  win32_cfgmgr32_read,
-  win32_cfgmgr32_write,
-  NULL,                                 /* read_vpd */
-  NULL,                                 /* init_dev */
-  win32_cfgmgr32_cleanup_dev,
+  .name = "win32-cfgmgr32",
+  .help = "Win32 device listing via Configuration Manager",
+  .config = win32_cfgmgr32_config,
+  .detect = win32_cfgmgr32_detect,
+  .init = win32_cfgmgr32_init,
+  .cleanup = win32_cfgmgr32_cleanup,
+  .scan = win32_cfgmgr32_scan,
+  .fill_info = win32_cfgmgr32_fill_info,
+  .read = win32_cfgmgr32_read,
+  .write = win32_cfgmgr32_write,
+  .cleanup_dev = win32_cfgmgr32_cleanup_dev,
 };
diff --git a/lib/win32-kldbg.c b/lib/win32-kldbg.c
index 33f5751..22078f5 100644
--- a/lib/win32-kldbg.c
+++ b/lib/win32-kldbg.c
@@ -715,17 +715,13 @@ win32_kldbg_write(struct pci_dev *d, int pos, byte *buf, int len)
 }
 
 struct pci_methods pm_win32_kldbg = {
-  "win32-kldbg",
-  "Win32 PCI config space access using Kernel Local Debugging Driver",
-  NULL,					/* config */
-  win32_kldbg_detect,
-  win32_kldbg_init,
-  win32_kldbg_cleanup,
-  win32_kldbg_scan,
-  pci_generic_fill_info,
-  win32_kldbg_read,
-  win32_kldbg_write,
-  NULL,					/* read_vpd */
-  NULL,					/* init_dev */
-  NULL					/* cleanup_dev */
+  .name = "win32-kldbg",
+  .help = "Win32 PCI config space access using Kernel Local Debugging Driver",
+  .detect = win32_kldbg_detect,
+  .init = win32_kldbg_init,
+  .cleanup = win32_kldbg_cleanup,
+  .scan = win32_kldbg_scan,
+  .fill_info = pci_generic_fill_info,
+  .read = win32_kldbg_read,
+  .write = win32_kldbg_write,
 };
diff --git a/lib/win32-sysdbg.c b/lib/win32-sysdbg.c
index 99ce607..0c175ca 100644
--- a/lib/win32-sysdbg.c
+++ b/lib/win32-sysdbg.c
@@ -290,17 +290,13 @@ win32_sysdbg_write(struct pci_dev *d, int pos, byte *buf, int len)
 }
 
 struct pci_methods pm_win32_sysdbg = {
-  "win32-sysdbg",
-  "Win32 PCI config space access using NT SysDbg Bus Data interface",
-  NULL,					/* config */
-  win32_sysdbg_detect,
-  win32_sysdbg_init,
-  win32_sysdbg_cleanup,
-  pci_generic_scan,
-  pci_generic_fill_info,
-  win32_sysdbg_read,
-  win32_sysdbg_write,
-  NULL,					/* read_vpd */
-  NULL,					/* init_dev */
-  NULL					/* cleanup_dev */
+  .name = "win32-sysdbg",
+  .help = "Win32 PCI config space access using NT SysDbg Bus Data interface",
+  .detect = win32_sysdbg_detect,
+  .init = win32_sysdbg_init,
+  .cleanup = win32_sysdbg_cleanup,
+  .scan = pci_generic_scan,
+  .fill_info = pci_generic_fill_info,
+  .read = win32_sysdbg_read,
+  .write = win32_sysdbg_write,
 };