From 489392feb7dd784b6036dd6511c690e4df9726e3 Mon Sep 17 00:00:00 2001 From: Mark Johnston Date: Sun, 23 Oct 2022 10:43:06 -0400 Subject: [PATCH] bhyve: Make hda_ops function tables const No functional change intended. MFC after: 1 week --- usr.sbin/bhyve/hda_codec.c | 8 ++++---- usr.sbin/bhyve/pci_hda.c | 2 +- usr.sbin/bhyve/pci_hda.h | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/usr.sbin/bhyve/hda_codec.c b/usr.sbin/bhyve/hda_codec.c index 2cc875d3d2e2..cfab2e7f2547 100644 --- a/usr.sbin/bhyve/hda_codec.c +++ b/usr.sbin/bhyve/hda_codec.c @@ -465,7 +465,7 @@ hda_codec_init(struct hda_codec_inst *hci, const char *play, static int hda_codec_reset(struct hda_codec_inst *hci) { - struct hda_ops *hops = NULL; + const struct hda_ops *hops = NULL; struct hda_codec_softc *sc = NULL; struct hda_codec_stream *st = NULL; int i; @@ -500,8 +500,8 @@ hda_codec_reset(struct hda_codec_inst *hci) static int hda_codec_command(struct hda_codec_inst *hci, uint32_t cmd_data) { + const struct hda_ops *hops = NULL; struct hda_codec_softc *sc = NULL; - struct hda_ops *hops = NULL; uint8_t cad = 0, nid = 0; uint16_t verb = 0, payload = 0; uint32_t res = 0; @@ -677,9 +677,9 @@ hda_codec_audio_output_nid(struct hda_codec_softc *sc, uint16_t verb, static void hda_codec_audio_output_do_transfer(void *arg) { + const struct hda_ops *hops = NULL; struct hda_codec_softc *sc = (struct hda_codec_softc *)arg; struct hda_codec_inst *hci = NULL; - struct hda_ops *hops = NULL; struct hda_codec_stream *st = NULL; struct audio *aud = NULL; int err; @@ -738,9 +738,9 @@ hda_codec_audio_input_nid(struct hda_codec_softc *sc, uint16_t verb, static void hda_codec_audio_input_do_transfer(void *arg) { + const struct hda_ops *hops = NULL; struct hda_codec_softc *sc = (struct hda_codec_softc *)arg; struct hda_codec_inst *hci = NULL; - struct hda_ops *hops = NULL; struct hda_codec_stream *st = NULL; struct audio *aud = NULL; int err; diff --git a/usr.sbin/bhyve/pci_hda.c b/usr.sbin/bhyve/pci_hda.c index 88f58a5fcc66..dc6493868093 100644 --- a/usr.sbin/bhyve/pci_hda.c +++ b/usr.sbin/bhyve/pci_hda.c @@ -264,7 +264,7 @@ static const uint16_t hda_rirb_sizes[] = { [HDAC_RIRBSIZE_RIRBSIZE_MASK] = 0, }; -static struct hda_ops hops = { +static const struct hda_ops hops = { .signal = hda_signal_state_change, .response = hda_response, .transfer = hda_transfer, diff --git a/usr.sbin/bhyve/pci_hda.h b/usr.sbin/bhyve/pci_hda.h index 50cbac82a1a6..a021aa9c28da 100644 --- a/usr.sbin/bhyve/pci_hda.h +++ b/usr.sbin/bhyve/pci_hda.h @@ -65,7 +65,7 @@ struct hda_codec_inst { uint8_t cad; struct hda_codec_class *codec; struct hda_softc *hda; - struct hda_ops *hops; + const struct hda_ops *hops; void *priv; };