mark some suspend/resume functions always returning zero as void; ok ratchov@

diff --git a/sys/dev/pci/auich.c b/sys/dev/pci/auich.c
index 8b821cc..1434570 100644 (file)
--- a/sys/dev/pci/auich.c
+++ b/sys/dev/pci/auich.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: auich.c,v 1.107 2018/09/13 04:07:20 miko Exp $        */
+/*     $OpenBSD: auich.c,v 1.108 2018/09/14 08:37:34 miko Exp $        */
 
 /*
  * Copyright (c) 2000,2001 Michael Shalayeff
@@ -313,7 +313,7 @@ int auich_alloc_cdata(struct auich_softc *);
 int auich_allocmem(struct auich_softc *, size_t, size_t, struct auich_dma *);
 int auich_freemem(struct auich_softc *, struct auich_dma *);
 
-int auich_resume(struct auich_softc *);
+void auich_resume(struct auich_softc *);
 
 struct audio_hw_if auich_hw_if = {
        auich_open,
@@ -1336,7 +1336,7 @@ auich_alloc_cdata(struct auich_softc *sc)
        return error;
 }
 
-int
+void
 auich_resume(struct auich_softc *sc)
 {
        /* SiS 7012 needs special handling */
@@ -1349,8 +1349,6 @@ auich_resume(struct auich_softc *sc)
        }
 
        ac97_resume(&sc->host_if, sc->codec_if);
-
-       return (0);
 }
 
 /* -------------------------------------------------------------------- */

diff --git a/sys/dev/pci/auvia.c b/sys/dev/pci/auvia.c
index c150b3e..4babfcf 100644 (file)
--- a/sys/dev/pci/auvia.c
+++ b/sys/dev/pci/auvia.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: auvia.c,v 1.58 2016/12/20 15:45:29 ratchov Exp $ */
+/*     $OpenBSD: auvia.c,v 1.59 2018/09/14 08:37:34 miko Exp $ */
 /*     $NetBSD: auvia.c,v 1.28 2002/11/04 16:38:49 kent Exp $  */
 
 /*-
@@ -211,7 +211,7 @@ int auvia_waitready_codec(struct auvia_softc *sc);
 int    auvia_waitvalid_codec(struct auvia_softc *sc);
 void   auvia_spdif_event(void *, int);
 
-int    auvia_resume(struct auvia_softc *);
+void   auvia_resume(struct auvia_softc *);
 
 const struct pci_matchid auvia_devices[] = {
        { PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT82C686A_AC97 },
@@ -982,8 +982,7 @@ auvia_intr(void *arg)
        return (i? 1 : 0);
 }
 
-
-int
+void
 auvia_resume(struct auvia_softc *sc)
 {
        pci_conf_read(sc->sc_pc, sc->sc_pt, AUVIA_PCICONF_JUNK);
@@ -991,7 +990,5 @@ auvia_resume(struct auvia_softc *sc)
            sc->sc_pci_junk);
 
        ac97_resume(&sc->host_if, sc->codec_if);
-
-       return (0);
 }
 

diff --git a/sys/dev/pci/cmpci.c b/sys/dev/pci/cmpci.c
index 7f998e3..08a7fad 100644 (file)
--- a/sys/dev/pci/cmpci.c
+++ b/sys/dev/pci/cmpci.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: cmpci.c,v 1.44 2018/09/13 04:07:20 miko Exp $ */
+/*     $OpenBSD: cmpci.c,v 1.45 2018/09/14 08:37:34 miko Exp $ */
 /*     $NetBSD: cmpci.c,v 1.25 2004/10/26 06:32:20 xtraeme Exp $       */
 
 /*
@@ -92,7 +92,7 @@ void cmpci_set_mixer_gain(struct cmpci_softc *, int);
 void cmpci_set_out_ports(struct cmpci_softc *);
 int cmpci_set_in_ports(struct cmpci_softc *);
 
-int cmpci_resume(struct cmpci_softc *);
+void cmpci_resume(struct cmpci_softc *);
 
 /*
  * autoconf interface
@@ -522,11 +522,10 @@ cmpci_activate(struct device *self, int act)
        return (config_activate_children(self, act));
 }
 
-int
+void
 cmpci_resume(struct cmpci_softc *sc)
 {
        cmpci_mixerreg_write(sc, CMPCI_SB16_MIXER_RESET, 0);
-       return 0;
 }
 
 int

diff --git a/sys/dev/pci/eap.c b/sys/dev/pci/eap.c
index e638052..bc20aa2 100644 (file)
--- a/sys/dev/pci/eap.c
+++ b/sys/dev/pci/eap.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: eap.c,v 1.55 2018/09/13 04:07:20 miko Exp $ */
+/*      $OpenBSD: eap.c,v 1.56 2018/09/14 08:37:34 miko Exp $ */
 /*     $NetBSD: eap.c,v 1.46 2001/09/03 15:07:37 reinoud Exp $ */
 
 /*
@@ -167,7 +167,7 @@ int eap_trigger_input(void *, void *, void *, int, void (*)(void *),
            void *, struct audio_params *);
 int    eap_halt_output(void *);
 int    eap_halt_input(void *);
-int    eap_resume(struct eap_softc *);
+void   eap_resume(struct eap_softc *);
 void    eap1370_write_codec(struct eap_softc *, int, int);
 int    eap1370_mixer_set_port(void *, mixer_ctrl_t *);
 int    eap1370_mixer_get_port(void *, mixer_ctrl_t *);
@@ -594,7 +594,7 @@ eap_attach(struct device *parent, struct device *self, void *aux)
 #endif
 }
 
-int
+void
 eap_resume(struct eap_softc *sc)
 {
        int i;
@@ -650,8 +650,6 @@ eap_resume(struct eap_softc *sc)
                /* Interrupt enable */
                EWRITE4(sc, EAP_SIC, EAP_P2_INTR_EN | EAP_R1_INTR_EN);
        }
-
-       return (0);
 }
 
 

diff --git a/sys/dev/pci/esa.c b/sys/dev/pci/esa.c
index ff4f65a..286db17 100644 (file)
--- a/sys/dev/pci/esa.c
+++ b/sys/dev/pci/esa.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: esa.c,v 1.34 2018/04/11 04:48:31 ratchov Exp $        */
+/*     $OpenBSD: esa.c,v 1.35 2018/09/14 08:37:34 miko Exp $   */
 /* $NetBSD: esa.c,v 1.12 2002/03/24 14:17:35 jmcneill Exp $ */
 
 /*
@@ -148,8 +148,8 @@ int         esa_add_list(struct esa_voice *, struct esa_list *, u_int16_t,
 void           esa_remove_list(struct esa_voice *, struct esa_list *, int);
 
 /* power management */
-int            esa_suspend(struct esa_softc *);
-int            esa_resume(struct esa_softc *);
+void           esa_suspend(struct esa_softc *);
+void           esa_resume(struct esa_softc *);
 
 struct audio_hw_if esa_hw_if = {
        esa_open,
@@ -1519,7 +1519,7 @@ esa_activate(struct device *self, int act)
        return 0;
 }
 
-int
+void
 esa_suspend(struct esa_softc *sc)
 {
        bus_space_tag_t iot = sc->sc_iot;
@@ -1542,12 +1542,11 @@ esa_suspend(struct esa_softc *sc)
            i++)
                sc->savemem[index++] = esa_read_assp(sc,
                    ESA_MEMTYPE_INTERNAL_DATA, i);
-
-       return (0);
 }
 
-int
-esa_resume(struct esa_softc *sc) {
+void
+esa_resume(struct esa_softc *sc)
+{
        bus_space_tag_t iot = sc->sc_iot;
        bus_space_handle_t ioh = sc->sc_ioh;
        int i, index;
@@ -1577,8 +1576,6 @@ esa_resume(struct esa_softc *sc) {
 
        esa_enable_interrupts(sc);
        esa_amp_enable(sc);
-
-       return (0);
 }
 
 u_int32_t