diff options
| author | hselasky <hselasky@FreeBSD.org> | 2012-09-22 08:02:42 +0000 |
|---|---|---|
| committer | hselasky <hselasky@FreeBSD.org> | 2012-09-22 08:02:42 +0000 |
| commit | e2942e62d2cbc482ed6e7e85157c35c06cfe9209 (patch) | |
| tree | 05a3f58c5190855d3dd41022a8d22cabeac9fc45 /sys/dev/usb/net | |
| parent | 082ae1b42fe7b44ffad1901b7be918f6c724f244 (diff) | |
| download | FreeBSD-src-e2942e62d2cbc482ed6e7e85157c35c06cfe9209.zip FreeBSD-src-e2942e62d2cbc482ed6e7e85157c35c06cfe9209.tar.gz | |
Apply some more casting.
Diffstat (limited to 'sys/dev/usb/net')
| -rw-r--r-- | sys/dev/usb/net/if_smsc.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/usb/net/if_smsc.c b/sys/dev/usb/net/if_smsc.c index 360b38c..6c9f60f 100644 --- a/sys/dev/usb/net/if_smsc.c +++ b/sys/dev/usb/net/if_smsc.c @@ -334,7 +334,7 @@ static int smsc_eeprom_read(struct smsc_softc *sc, uint16_t off, uint8_t *buf, uint16_t buflen) { usb_ticks_t start_ticks; - usb_ticks_t max_ticks = USB_MS_TO_TICKS(1000); + const usb_ticks_t max_ticks = USB_MS_TO_TICKS(1000); int err; int locked; uint32_t val; @@ -365,8 +365,8 @@ smsc_eeprom_read(struct smsc_softc *sc, uint16_t off, uint8_t *buf, uint16_t buf break; uether_pause(&sc->sc_ue, hz / 100); - } while ((ticks - start_ticks) < max_ticks); - + } while (((usb_ticks_t)(ticks - start_ticks)) < max_ticks); + if (val & (SMSC_EEPROM_CMD_BUSY | SMSC_EEPROM_CMD_TIMEOUT)) { smsc_warn_printf(sc, "eeprom command failed\n"); err = USB_ERR_IOERROR; @@ -1247,7 +1247,7 @@ smsc_phy_init(struct smsc_softc *sc) { int bmcr; usb_ticks_t start_ticks; - usb_ticks_t max_ticks = USB_MS_TO_TICKS(1000); + const usb_ticks_t max_ticks = USB_MS_TO_TICKS(1000); SMSC_LOCK_ASSERT(sc, MA_OWNED); @@ -1260,7 +1260,7 @@ smsc_phy_init(struct smsc_softc *sc) bmcr = smsc_miibus_readreg(sc->sc_ue.ue_dev, sc->sc_phyno, MII_BMCR); } while ((bmcr & MII_BMCR) && ((ticks - start_ticks) < max_ticks)); - if ((ticks - start_ticks) >= max_ticks) { + if (((usb_ticks_t)(ticks - start_ticks)) >= max_ticks) { smsc_err_printf(sc, "PHY reset timed-out"); return (EIO); } |
