| Message ID | 20200813175729.15088-1-andriy.shevchenko@linux.intel.com |
|---|---|
| State | New |
| Headers | show |
| Series | [v1,1/7] resource: Simplify region_intersects() by reducing conditionals | expand |
diff --git a/kernel/resource.c b/kernel/resource.c index 841737bbda9e..70575a61bf20 100644 --- a/kernel/resource.c +++ b/kernel/resource.c @@ -554,13 +554,10 @@ int region_intersects(resource_size_t start, size_t size, unsigned long flags, } read_unlock(&resource_lock); - if (other == 0) - return type ? REGION_INTERSECTS : REGION_DISJOINT; + if (type == 0) + return REGION_DISJOINT; - if (type) - return REGION_MIXED; - - return REGION_DISJOINT; + return (other == 0) ? REGION_INTERSECTS : REGION_MIXED; } EXPORT_SYMBOL_GPL(region_intersects);
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> --- kernel/resource.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)