d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove a pointless KASSERT and reword a comment a bit. The KASSERT tested

Browse Source 
for the same condition that the preceeding lines checked for and would have
returned EIO, so the assert could never possibly trigger (sc_sectorsize must
inherently be an integer multiple of FLASH_PAGE_SIZE).
This commit is contained in:
Ian Lepore 2018-03-18 16:10:14 +00:00
parent cba559e112
commit f432eb7ea1
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/dev/flash/mx25l.c
View File

@ -300,20 +300,12 @@ mx25l_write(device_t dev, off_t offset, caddr_t data, off_t count)
write_offset = offset; write_offset = offset;
/* /*
* Use the erase sectorsize here since blocks are fully erased * Writes must be aligned to the erase sectorsize, since blocks are
* first before they're written to. * fully erased before they're written to.
*/ */
if (count % sc->sc_sectorsize != 0 || offset % sc->sc_sectorsize != 0) if (count % sc->sc_sectorsize != 0 || offset % sc->sc_sectorsize != 0)
return (EIO); return (EIO);
/*
* Assume here that we write per-sector only
* and sector size should be 256 bytes aligned
*/
KASSERT(write_offset % FLASH_PAGE_SIZE == 0,
("offset for BIO_WRITE is not page size (%d bytes) aligned",
FLASH_PAGE_SIZE));
/* /*
* Maximum write size for CMD_PAGE_PROGRAM is * Maximum write size for CMD_PAGE_PROGRAM is
* FLASH_PAGE_SIZE, so split data to chunks * FLASH_PAGE_SIZE, so split data to chunks