X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=lib%2Faos-expansion.c;h=e36358e3968069f74249b65b1fc429cdde0c711f;hb=9f3d614e4578bdec2b60d97caec400b28d4af9d3;hp=7f927a477b81d14ccae447a8fbbe2168bfcf1669;hpb=d66c6ff6b363c48680766dd4ab8087a6e57baef5;p=pciutils.git

diff --git a/lib/aos-expansion.c b/lib/aos-expansion.c
index 7f927a4..e36358e 100644
--- a/lib/aos-expansion.c
+++ b/lib/aos-expansion.c
@@ -45,9 +45,8 @@ typedef struct _PCIAccess {
 static void 
 aos_close_pci_interface(struct pci_access *a)
 {
-	PCIAccess *pci;
+	PCIAccess *pci = a->backend_data;
 
-	pci = (PCIAccess *)a->backend_data;
 	if (pci) {
 		if (pci->expansion) {
 			if (pci->ipci) {
@@ -222,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,
 };