diff options
| author | Mateusz Guzik <mjg@FreeBSD.org> | 2020-09-01 22:10:34 +0000 |
|---|---|---|
| committer | Mateusz Guzik <mjg@FreeBSD.org> | 2020-09-01 22:10:34 +0000 |
| commit | 097958918887ebe5e1ce4ec515a164e939442ecb (patch) | |
| tree | 6c585ee50f0798bb845d37c9d8939975e7538353 /sys/dev/cfi | |
| parent | 9c0df1da919df505ee9f2f973b060c077f827d19 (diff) | |
Notes
Diffstat (limited to 'sys/dev/cfi')
| -rw-r--r-- | sys/dev/cfi/cfi_bus_nexus.c | 1 | ||||
| -rw-r--r-- | sys/dev/cfi/cfi_core.c | 4 | ||||
| -rw-r--r-- | sys/dev/cfi/cfi_disk.c | 2 |
3 files changed, 1 insertions, 6 deletions
diff --git a/sys/dev/cfi/cfi_bus_nexus.c b/sys/dev/cfi/cfi_bus_nexus.c index 6620a34acb39..1c2607aadf91 100644 --- a/sys/dev/cfi/cfi_bus_nexus.c +++ b/sys/dev/cfi/cfi_bus_nexus.c @@ -72,7 +72,6 @@ static device_method_t cfi_nexus_methods[] = { DEVMETHOD(device_probe, cfi_nexus_probe), DEVMETHOD(device_attach, cfi_nexus_attach), DEVMETHOD(device_detach, cfi_detach), - {0, 0} }; diff --git a/sys/dev/cfi/cfi_core.c b/sys/dev/cfi/cfi_core.c index e1470dcfd115..0c88fc8cf47e 100644 --- a/sys/dev/cfi/cfi_core.c +++ b/sys/dev/cfi/cfi_core.c @@ -162,7 +162,7 @@ uint8_t cfi_read_qry(struct cfi_softc *sc, u_int ofs) { uint8_t val; - + cfi_write(sc, CFI_QRY_CMD_ADDR * sc->sc_width, CFI_QRY_CMD_DATA); val = cfi_read(sc, ofs * sc->sc_width); cfi_reset_default(sc); @@ -751,12 +751,10 @@ cfi_write_block(struct cfi_softc *sc) /* Fall through to single word case */ break; } - } /* Write the block one byte/word at a time. */ for (i = 0; i < sc->sc_wrbufsz; i += sc->sc_width) { - /* Avoid writing unless we are actually changing bits */ if (!neederase) { switch (sc->sc_width) { diff --git a/sys/dev/cfi/cfi_disk.c b/sys/dev/cfi/cfi_disk.c index 08aef986b257..5e55f79532dd 100644 --- a/sys/dev/cfi/cfi_disk.c +++ b/sys/dev/cfi/cfi_disk.c @@ -309,7 +309,6 @@ cfi_disk_getattr(struct bio *bp) return (0); } - static void cfi_disk_strategy(struct bio *bp) { @@ -350,7 +349,6 @@ static device_method_t cfi_disk_methods[] = { DEVMETHOD(device_probe, cfi_disk_probe), DEVMETHOD(device_attach, cfi_disk_attach), DEVMETHOD(device_detach, cfi_disk_detach), - { 0, 0 } }; static driver_t cfi_disk_driver = { |
