From 0be337f51a7685d78e0b0efa02547ab64ff93092 Mon Sep 17 00:00:00 2001 From: bluhm Date: Tue, 20 Aug 2024 15:30:29 +0000 Subject: [PATCH] Fix whitespace in amd64 bus dma. --- sys/arch/amd64/amd64/bus_dma.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/sys/arch/amd64/amd64/bus_dma.c b/sys/arch/amd64/amd64/bus_dma.c index a0d3ad1f3a0..c29501ad735 100644 --- a/sys/arch/amd64/amd64/bus_dma.c +++ b/sys/arch/amd64/amd64/bus_dma.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bus_dma.c,v 1.55 2024/08/20 12:36:09 sf Exp $ */ +/* $OpenBSD: bus_dma.c,v 1.56 2024/08/20 15:30:29 bluhm Exp $ */ /* $NetBSD: bus_dma.c,v 1.3 2003/05/07 21:33:58 fvdl Exp $ */ /*- @@ -146,9 +146,9 @@ _bus_dmamap_create(bus_dma_tag_t t, bus_size_t size, int nsegments, mapsize += sizeof(struct vm_page *) * npages; } - if ((mapstore = malloc(mapsize, M_DEVBUF, - (flags & BUS_DMA_NOWAIT) ? - (M_NOWAIT|M_ZERO) : (M_WAITOK|M_ZERO))) == NULL) + mapstore = malloc(mapsize, M_DEVBUF, + (flags & BUS_DMA_NOWAIT) ? (M_NOWAIT|M_ZERO) : (M_WAITOK|M_ZERO)); + if (mapstore == NULL) return (ENOMEM); map = (struct bus_dmamap *)mapstore; @@ -418,8 +418,8 @@ _bus_dmamap_load_raw(bus_dma_tag_t t, bus_dmamap_t map, bus_dma_segment_t *segs, if (paddr > dma_constraint.ucr_high && (map->_dm_flags & BUS_DMA_64BIT) == 0) - panic("Non dma-reachable buffer at paddr %#lx(raw)", - paddr); + panic("Non dma-reachable buffer at " + "paddr %#lx(raw)", paddr); /* * Make sure we don't cross any boundaries. @@ -865,4 +865,3 @@ _bus_dmamem_alloc_range(bus_dma_tag_t t, bus_size_t size, bus_size_t alignment, return (0); } - -- 2.20.1