From 8304d273aa4599de57782c1a5d924a9d49082d8f Mon Sep 17 00:00:00 2001 From: nat Date: Sat, 1 Jul 2017 05:50:10 +0000 Subject: [PATCH] sc_audiodev should be defined as a device_t as this is what audio_attach_mi returns. --- sys/dev/pad/pad.c | 6 +++--- sys/dev/pad/padvar.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/dev/pad/pad.c b/sys/dev/pad/pad.c index fdffb8d9e485..25dcd2f6c2fa 100644 --- a/sys/dev/pad/pad.c +++ b/sys/dev/pad/pad.c @@ -1,4 +1,4 @@ -/* $NetBSD: pad.c,v 1.37 2017/06/19 23:54:00 nat Exp $ */ +/* $NetBSD: pad.c,v 1.38 2017/07/01 05:50:10 nat Exp $ */ /*- * Copyright (c) 2007 Jared D. McNeill @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: pad.c,v 1.37 2017/06/19 23:54:00 nat Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pad.c,v 1.38 2017/07/01 05:50:10 nat Exp $"); #include #include @@ -277,7 +277,7 @@ pad_attach(device_t parent, device_t self, void *opaque) sc->sc_swvol = 255; sc->sc_buflen = 0; sc->sc_rpos = sc->sc_wpos = 0; - sc->sc_audiodev = (void *)audio_attach_mi(&pad_hw_if, sc, sc->sc_dev); + sc->sc_audiodev = audio_attach_mi(&pad_hw_if, sc, sc->sc_dev); if (!pmf_device_register(self, NULL, NULL)) aprint_error_dev(self, "couldn't establish power handler\n"); diff --git a/sys/dev/pad/padvar.h b/sys/dev/pad/padvar.h index 262621395faa..082e6387de63 100644 --- a/sys/dev/pad/padvar.h +++ b/sys/dev/pad/padvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: padvar.h,v 1.9 2017/06/06 07:31:40 nat Exp $ */ +/* $NetBSD: padvar.h,v 1.10 2017/07/01 05:50:10 nat Exp $ */ /*- * Copyright (c) 2007 Jared D. McNeill @@ -41,7 +41,7 @@ typedef struct pad_softc { kmutex_t sc_lock; kmutex_t sc_intr_lock; - struct audio_softc *sc_audiodev; + device_t sc_audiodev; int sc_blksize; #define PAD_BLKSIZE 8192