mirror of
https://git.FreeBSD.org/src.git
synced 2024-12-05 09:14:03 +00:00
vm_offset_t is unsigned and therefore can not be negative.
Avoid unnessecary compares. Found with: Coverity Prevent(tm) CID: 2362,4215,4214,4209,4208,2363,4211,4210,4213,4212 MFC after: 3 days
This commit is contained in:
parent
1a604cfa07
commit
45d0290a5d
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=190169
@ -532,7 +532,7 @@ agp_generic_bind_memory(device_t dev, struct agp_memory *mem,
|
||||
int error;
|
||||
|
||||
/* Do some sanity checks first. */
|
||||
if (offset < 0 || (offset & (AGP_PAGE_SIZE - 1)) != 0 ||
|
||||
if ((offset & (AGP_PAGE_SIZE - 1)) != 0 ||
|
||||
offset + mem->am_size > AGP_GET_APERTURE(dev)) {
|
||||
device_printf(dev, "binding memory at bad offset %#x\n",
|
||||
(int)offset);
|
||||
|
@ -337,7 +337,7 @@ agp_amd64_bind_page(device_t dev, vm_offset_t offset, vm_offset_t physical)
|
||||
{
|
||||
struct agp_amd64_softc *sc = device_get_softc(dev);
|
||||
|
||||
if (offset < 0 || offset >= (sc->gatt->ag_entries << AGP_PAGE_SHIFT))
|
||||
if (offset >= (sc->gatt->ag_entries << AGP_PAGE_SHIFT))
|
||||
return (EINVAL);
|
||||
|
||||
sc->gatt->ag_virtual[offset >> AGP_PAGE_SHIFT] =
|
||||
@ -351,7 +351,7 @@ agp_amd64_unbind_page(device_t dev, vm_offset_t offset)
|
||||
{
|
||||
struct agp_amd64_softc *sc = device_get_softc(dev);
|
||||
|
||||
if (offset < 0 || offset >= (sc->gatt->ag_entries << AGP_PAGE_SHIFT))
|
||||
if (offset >= (sc->gatt->ag_entries << AGP_PAGE_SHIFT))
|
||||
return (EINVAL);
|
||||
|
||||
sc->gatt->ag_virtual[offset >> AGP_PAGE_SHIFT] = 0;
|
||||
|
@ -840,7 +840,7 @@ agp_i810_bind_page(device_t dev, vm_offset_t offset, vm_offset_t physical)
|
||||
{
|
||||
struct agp_i810_softc *sc = device_get_softc(dev);
|
||||
|
||||
if (offset < 0 || offset >= (sc->gatt->ag_entries << AGP_PAGE_SHIFT)) {
|
||||
if (offset >= (sc->gatt->ag_entries << AGP_PAGE_SHIFT)) {
|
||||
device_printf(dev, "failed: offset is 0x%08jx, shift is %d, entries is %d\n", (intmax_t)offset, AGP_PAGE_SHIFT, sc->gatt->ag_entries);
|
||||
return EINVAL;
|
||||
}
|
||||
@ -862,7 +862,7 @@ agp_i810_unbind_page(device_t dev, vm_offset_t offset)
|
||||
{
|
||||
struct agp_i810_softc *sc = device_get_softc(dev);
|
||||
|
||||
if (offset < 0 || offset >= (sc->gatt->ag_entries << AGP_PAGE_SHIFT))
|
||||
if (offset >= (sc->gatt->ag_entries << AGP_PAGE_SHIFT))
|
||||
return EINVAL;
|
||||
|
||||
if ( sc->chiptype != CHIP_I810 ) {
|
||||
@ -1016,7 +1016,7 @@ agp_i810_bind_memory(device_t dev, struct agp_memory *mem,
|
||||
vm_offset_t i;
|
||||
|
||||
/* Do some sanity checks first. */
|
||||
if (offset < 0 || (offset & (AGP_PAGE_SIZE - 1)) != 0 ||
|
||||
if ((offset & (AGP_PAGE_SIZE - 1)) != 0 ||
|
||||
offset + mem->am_size > AGP_GET_APERTURE(dev)) {
|
||||
device_printf(dev, "binding memory at bad offset %#x\n",
|
||||
(int)offset);
|
||||
|
@ -371,7 +371,7 @@ agp_intel_bind_page(device_t dev, vm_offset_t offset, vm_offset_t physical)
|
||||
|
||||
sc = device_get_softc(dev);
|
||||
|
||||
if (offset < 0 || offset >= (sc->gatt->ag_entries << AGP_PAGE_SHIFT))
|
||||
if (offset >= (sc->gatt->ag_entries << AGP_PAGE_SHIFT))
|
||||
return (EINVAL);
|
||||
|
||||
sc->gatt->ag_virtual[offset >> AGP_PAGE_SHIFT] = physical | 0x17;
|
||||
@ -385,7 +385,7 @@ agp_intel_unbind_page(device_t dev, vm_offset_t offset)
|
||||
|
||||
sc = device_get_softc(dev);
|
||||
|
||||
if (offset < 0 || offset >= (sc->gatt->ag_entries << AGP_PAGE_SHIFT))
|
||||
if (offset >= (sc->gatt->ag_entries << AGP_PAGE_SHIFT))
|
||||
return (EINVAL);
|
||||
|
||||
sc->gatt->ag_virtual[offset >> AGP_PAGE_SHIFT] = 0;
|
||||
|
@ -362,7 +362,7 @@ agp_via_bind_page(device_t dev, vm_offset_t offset, vm_offset_t physical)
|
||||
{
|
||||
struct agp_via_softc *sc = device_get_softc(dev);
|
||||
|
||||
if (offset < 0 || offset >= (sc->gatt->ag_entries << AGP_PAGE_SHIFT))
|
||||
if (offset >= (sc->gatt->ag_entries << AGP_PAGE_SHIFT))
|
||||
return EINVAL;
|
||||
|
||||
sc->gatt->ag_virtual[offset >> AGP_PAGE_SHIFT] = physical;
|
||||
@ -374,7 +374,7 @@ agp_via_unbind_page(device_t dev, vm_offset_t offset)
|
||||
{
|
||||
struct agp_via_softc *sc = device_get_softc(dev);
|
||||
|
||||
if (offset < 0 || offset >= (sc->gatt->ag_entries << AGP_PAGE_SHIFT))
|
||||
if (offset >= (sc->gatt->ag_entries << AGP_PAGE_SHIFT))
|
||||
return EINVAL;
|
||||
|
||||
sc->gatt->ag_virtual[offset >> AGP_PAGE_SHIFT] = 0;
|
||||
|
Loading…
Reference in New Issue
Block a user