resource: Simplify region_intersects() by reducing conditionals

Now we have for 'other' and 'type' variables

other	type	return
  0	  0	REGION_DISJOINT
  0	  x	REGION_INTERSECTS
  x	  0	REGION_DISJOINT
  x	  x	REGION_MIXED

Obviously it's easier to check 'type' for 0 first instead of
currently checked 'other'.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Hanjun Guo <guohanjun@huawei.com>
Tested-by: Hanjun Guo <guohanjun@huawei.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Andy Shevchenko 2020-11-03 22:45:04 +02:00 committed by Rafael J. Wysocki
parent 09162bc32c
commit 66f4fa32eb

View File

@ -557,13 +557,13 @@ int region_intersects(resource_size_t start, size_t size, unsigned long flags,
}
read_unlock(&resource_lock);
if (type == 0)
return REGION_DISJOINT;
if (other == 0)
return type ? REGION_INTERSECTS : REGION_DISJOINT;
return REGION_INTERSECTS;
if (type)
return REGION_MIXED;
return REGION_DISJOINT;
return REGION_MIXED;
}
EXPORT_SYMBOL_GPL(region_intersects);