1From f900e34e7b01e68449972652f7d0eef47262053f Mon Sep 17 00:00:00 2001
 2From: Michael Forney <mforney@mforney.org>
 3Date: Sun, 16 Aug 2020 16:23:49 -0700
 4Subject: [PATCH] Avoid return of void expression
 5
 6---
 7 lib/filter.c   | 2 +-
 8 lib/init.c     | 2 +-
 9 lib/internal.h | 1 +
10 3 files changed, 3 insertions(+), 2 deletions(-)
11
12diff --git a/lib/filter.c b/lib/filter.c
13index 441eb51..145861a 100644
14--- a/lib/filter.c
15+++ b/lib/filter.c
16@@ -309,7 +309,7 @@ pci_filter_match_v30(struct pci_filter_v30 *f, struct pci_dev *d)
17 // Version 3.3 is the same as version 3.8, only device_class_mask and prog_if were not implemented
18 // (their positions in struct pci_filter were declared as RFU).
19 
20-STATIC_ALIAS(void pci_filter_init(struct pci_access *a, struct pci_filter *f), pci_filter_init_v38(a, f))
21+STATIC_ALIAS_VOID(void pci_filter_init(struct pci_access *a, struct pci_filter *f), pci_filter_init_v38(a, f))
22 DEFINE_ALIAS(void pci_filter_init_v33(struct pci_access *a, struct pci_filter *f), pci_filter_init_v38)
23 SYMBOL_VERSION(pci_filter_init_v30, pci_filter_init@LIBPCI_3.0)
24 SYMBOL_VERSION(pci_filter_init_v33, pci_filter_init@LIBPCI_3.3)
25diff --git a/lib/init.c b/lib/init.c
26index 9867a47..232dba3 100644
27--- a/lib/init.c
28+++ b/lib/init.c
29@@ -531,7 +531,7 @@ pci_init_v35(struct pci_access *a)
30     a->error("Cannot find any working access method.");
31 }
32 
33-STATIC_ALIAS(void pci_init(struct pci_access *a), pci_init_v35(a))
34+STATIC_ALIAS_VOID(void pci_init(struct pci_access *a), pci_init_v35(a))
35 DEFINE_ALIAS(void pci_init_v30(struct pci_access *a), pci_init_v35)
36 SYMBOL_VERSION(pci_init_v30, pci_init@LIBPCI_3.0)
37 SYMBOL_VERSION(pci_init_v35, pci_init@@LIBPCI_3.5)
38diff --git a/lib/internal.h b/lib/internal.h
39index 43be8d1..8fe9ad8 100644
40--- a/lib/internal.h
41+++ b/lib/internal.h
42@@ -39,6 +39,7 @@
43 #else
44 #define VERSIONED_ABI
45 #define STATIC_ALIAS(_decl, _for) _decl { return _for; }
46+#define STATIC_ALIAS_VOID(_decl, _for) _decl { _for; }
47 #define DEFINE_ALIAS(_decl, _for)
48 #define SYMBOL_VERSION(_int, _ext)
49 #endif
50-- 
512.49.0
52