Module Name: src Committed By: skrll Date: Sun May 8 06:38:59 UTC 2022
Modified Files: src/sys/dev/spi: spi.c spiflash.c Log Message: Trailing whitespace To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/sys/dev/spi/spi.c cvs rdiff -u -r1.25 -r1.26 src/sys/dev/spi/spiflash.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/dev/spi/spi.c diff -u src/sys/dev/spi/spi.c:1.24 src/sys/dev/spi/spi.c:1.25 --- src/sys/dev/spi/spi.c:1.24 Mon Mar 28 11:09:24 2022 +++ src/sys/dev/spi/spi.c Sun May 8 06:38:58 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: spi.c,v 1.24 2022/03/28 11:09:24 mlelstv Exp $ */ +/* $NetBSD: spi.c,v 1.25 2022/05/08 06:38:58 skrll Exp $ */ /*- * Copyright (c) 2006 Urbana-Champaign Independent Media Center. @@ -42,7 +42,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: spi.c,v 1.24 2022/03/28 11:09:24 mlelstv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: spi.c,v 1.25 2022/05/08 06:38:58 skrll Exp $"); #include "locators.h" @@ -544,7 +544,7 @@ spi_transfer(struct spi_handle *sh, stru spi_acquire(sh); st->st_spiprivate = (void *)sh; - + /* * Reconfigure controller * Index: src/sys/dev/spi/spiflash.c diff -u src/sys/dev/spi/spiflash.c:1.25 src/sys/dev/spi/spiflash.c:1.26 --- src/sys/dev/spi/spiflash.c:1.25 Sat Aug 7 16:19:16 2021 +++ src/sys/dev/spi/spiflash.c Sun May 8 06:38:58 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: spiflash.c,v 1.25 2021/08/07 16:19:16 thorpej Exp $ */ +/* $NetBSD: spiflash.c,v 1.26 2022/05/08 06:38:58 skrll Exp $ */ /*- * Copyright (c) 2006 Urbana-Champaign Independent Media Center. @@ -42,7 +42,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: spiflash.c,v 1.25 2021/08/07 16:19:16 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: spiflash.c,v 1.26 2022/05/08 06:38:58 skrll Exp $"); #include <sys/param.h> #include <sys/conf.h> @@ -384,7 +384,7 @@ spiflash_process_read(spiflash_handle_t bufq_move(sc->sc_doneq, sc->sc_workq); break; } - + bp->b_resid -= cnt; data += cnt; addr += cnt; @@ -422,7 +422,7 @@ spiflash_process_write(spiflash_handle_t /* read in as much of the data as we need */ DPRINTF(("reading in %d bytes\n", len)); if ((err = sc->sc_read(sc, base, len, save)) != 0) { - bufq_move(sc->sc_doneq, sc->sc_workq); + bufq_move(sc->sc_doneq, sc->sc_workq); spiflash_process_done(sc, err); return; } @@ -455,7 +455,7 @@ spiflash_process_write(spiflash_handle_t bufq_put(sc->sc_doneq, bp); } - + /* * do the erase, if we need to. */ @@ -578,7 +578,7 @@ spiflash_common_erase(spiflash_handle_t if ((start % sc->sc_erase_size) || (size % sc->sc_erase_size)) return EINVAL; - /* the second test is to test against wrap */ + /* the second test is to test against wrap */ if ((start > sc->sc_device_size) || ((start + size) > sc->sc_device_size)) return EINVAL; @@ -674,7 +674,7 @@ spiflash_common_read(spiflash_handle_t s if (sc->sc_read_size > 0) cnt = uimin(size, sc->sc_read_size); - else + else cnt = size; if ((rv = spiflash_cmd(sc, SPIFLASH_CMD_READ, 3, start,