svn commit: r358047 - projects/clang1000-import/sys/dev/altera/sdcard

[Dimitry Andric]

Author: dim
Date: Mon Feb 17 20:25:29 2020
New Revision: 358047
URL: https://svnweb.freebsd.org/changeset/base/358047

Log:
  Revert r358029 in anticipation of merging the different fix from head.

Modified:
  projects/clang1000-import/sys/dev/altera/sdcard/altera_sdcard_io.c

Modified: projects/clang1000-import/sys/dev/altera/sdcard/altera_sdcard_io.c
==============================================================================
--- projects/clang1000-import/sys/dev/altera/sdcard/altera_sdcard_io.c	Mon Feb 17 20:24:21 2020	(r358046)
+++ projects/clang1000-import/sys/dev/altera/sdcard/altera_sdcard_io.c	Mon Feb 17 20:25:29 2020	(r358047)
@@ -293,27 +293,27 @@ recheck:
 }
 
 static void
-altera_sdcard_io_start_internal(struct altera_sdcard_softc *sc, struct bio **bpp)
+altera_sdcard_io_start_internal(struct altera_sdcard_softc *sc, struct bio **bp)
 {
 
-	switch ((*bpp)->bio_cmd) {
+	switch (*bp->bio_cmd) {
 	case BIO_READ:
-		altera_sdcard_write_cmd_arg(sc, (*bpp)->bio_pblkno *
+		altera_sdcard_write_cmd_arg(sc, *bp->bio_pblkno *
 		    ALTERA_SDCARD_SECTORSIZE);
 		altera_sdcard_write_cmd(sc, ALTERA_SDCARD_CMD_READ_BLOCK);
 		break;
 
 	case BIO_WRITE:
-		altera_sdcard_write_rxtx_buffer(sc, (*bpp)->bio_data,
-		    (*bpp)->bio_bcount);
-		altera_sdcard_write_cmd_arg(sc, (*bpp)->bio_pblkno *
+		altera_sdcard_write_rxtx_buffer(sc, *bp->bio_data,
+		    *bp->bio_bcount);
+		altera_sdcard_write_cmd_arg(sc, *bp->bio_pblkno *
 		    ALTERA_SDCARD_SECTORSIZE);
 		altera_sdcard_write_cmd(sc, ALTERA_SDCARD_CMD_WRITE_BLOCK);
 		break;
 
 	default:
-		biofinish(*bpp, NULL, EOPNOTSUPP);
-		*bpp = NULL;
+		biofinish(*bp, NULL, EOPNOTSUPP);
+		*bp = NULL;
 	}
 }
 
@@ -333,7 +333,7 @@ altera_sdcard_io_start(struct altera_sdcard_softc *sc,
 	KASSERT(bp->bio_bcount == ALTERA_SDCARD_SECTORSIZE,
 	    ("%s: I/O size not %d", __func__, ALTERA_SDCARD_SECTORSIZE));
 	altera_sdcard_io_start_internal(sc, &bp);
-	sc->as_currentbio = bp;
+	sc->as_currentbio = *bp;
 	sc->as_retriesleft = ALTERA_SDCARD_RETRY_LIMIT;
 }