The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=2257e872030064c484b4eda02276f36410e5ccd4
commit 2257e872030064c484b4eda02276f36410e5ccd4 Author: John Baldwin <[email protected]> AuthorDate: 2022-04-13 23:08:23 +0000 Commit: John Baldwin <[email protected]> CommitDate: 2022-04-13 23:08:23 +0000 dpaa: Remove unused variables. --- sys/contrib/ncsw/Peripherals/QM/qm_portal_fqr.c | 2 -- sys/dev/dpaa/fman.c | 2 -- sys/dev/dpaa/qman.c | 2 -- 3 files changed, 6 deletions(-) diff --git a/sys/contrib/ncsw/Peripherals/QM/qm_portal_fqr.c b/sys/contrib/ncsw/Peripherals/QM/qm_portal_fqr.c index bdb7d5175530..31313d37f97c 100644 --- a/sys/contrib/ncsw/Peripherals/QM/qm_portal_fqr.c +++ b/sys/contrib/ncsw/Peripherals/QM/qm_portal_fqr.c @@ -1493,7 +1493,6 @@ static t_Error QmPortalPullFrame(t_Handle h_QmPortal, uint32_t pdqcr, t_DpaaFD * { t_QmPortal *p_QmPortal = (t_QmPortal *)h_QmPortal; struct qm_dqrr_entry *p_Dq; - struct qman_fq *p_Fq; int prefetch; uint32_t *p_Dst, *p_Src; @@ -1516,7 +1515,6 @@ static t_Error QmPortalPullFrame(t_Handle h_QmPortal, uint32_t pdqcr, t_DpaaFD * p_Dq = qm_dqrr_current(p_QmPortal->p_LowQmPortal); if (!p_Dq) continue; - p_Fq = ptr_from_aligned_int(p_Dq->contextB); ASSERT_COND(p_Dq->fqid); p_Dst = (uint32_t *)p_Frame; p_Src = (uint32_t *)&p_Dq->fd; diff --git a/sys/dev/dpaa/fman.c b/sys/dev/dpaa/fman.c index d3327399fb88..64709b07fc42 100644 --- a/sys/dev/dpaa/fman.c +++ b/sys/dev/dpaa/fman.c @@ -123,14 +123,12 @@ int fman_release_resource(device_t bus, device_t child, int type, int rid, struct resource *res) { - struct fman_softc *sc; struct resource_list *rl; struct resource_list_entry *rle; int passthrough, rv; passthrough = (device_get_parent(child) != bus); rl = BUS_GET_RESOURCE_LIST(bus, child); - sc = device_get_softc(bus); if (type != SYS_RES_IRQ) { if ((rman_get_flags(res) & RF_ACTIVE) != 0 ){ rv = bus_deactivate_resource(child, type, rid, res); diff --git a/sys/dev/dpaa/qman.c b/sys/dev/dpaa/qman.c index a090d49adea1..92ea38a16534 100644 --- a/sys/dev/dpaa/qman.c +++ b/sys/dev/dpaa/qman.c @@ -304,13 +304,11 @@ qman_fqr_create(uint32_t fqids_num, e_QmFQChannel channel, uint8_t wq, { struct qman_softc *sc; t_QmFqrParams fqr; - unsigned int cpu; t_Handle fqrh, portal; sc = qman_sc; sched_pin(); - cpu = PCPU_GET(cpuid); /* Ensure we have got QMan port initialized */ portal = qman_portal_setup(sc);
