Date: Wed, 16 Oct 2019 03:03:59 +0000 (UTC) From: Justin Hibbits <jhibbits@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r353604 - head/sys/powerpc/mpc85xx Message-ID: <201910160303.x9G33xNZ060426@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jhibbits Date: Wed Oct 16 03:03:59 2019 New Revision: 353604 URL: https://svnweb.freebsd.org/changeset/base/353604 Log: powerpc/mpc85xx: Fix function type for fsl_pcib_error_intr() Since it's only called as an interrupt handler, fsl_pcib_eror_intr() should just match the driver_intr_t type. Reported by: bdragon Modified: head/sys/powerpc/mpc85xx/pci_mpc85xx.c Modified: head/sys/powerpc/mpc85xx/pci_mpc85xx.c ============================================================================== --- head/sys/powerpc/mpc85xx/pci_mpc85xx.c Wed Oct 16 00:38:50 2019 (r353603) +++ head/sys/powerpc/mpc85xx/pci_mpc85xx.c Wed Oct 16 03:03:59 2019 (r353604) @@ -228,7 +228,7 @@ DEFINE_CLASS_1(pcib, fsl_pcib_driver, fsl_pcib_methods EARLY_DRIVER_MODULE(pcib, ofwbus, fsl_pcib_driver, fsl_pcib_devclass, 0, 0, BUS_PASS_BUS); -static int +static void fsl_pcib_err_intr(void *v) { struct fsl_pcib_softc *sc; @@ -253,8 +253,6 @@ fsl_pcib_err_intr(void *v) /* Clear pending errors */ bus_space_write_4(sc->sc_bst, sc->sc_bsh, REG_PEX_ERR_DR, clear_reg); - - return (0); } static int @@ -380,7 +378,7 @@ fsl_pcib_attach(device_t dev) /* Setup interrupt handler */ error = bus_setup_intr(dev, sc->sc_irq_res, INTR_TYPE_MISC | INTR_MPSAFE, - NULL, (driver_intr_t *)fsl_pcib_err_intr, dev, &sc->sc_ih); + NULL, fsl_pcib_err_intr, dev, &sc->sc_ih); if (error != 0) { device_printf(dev, "Could not setup irq, %d\n", error); sc->sc_ih = NULL;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201910160303.x9G33xNZ060426>