ASoC: Intel: catpt: Replace open coded variant of resource_intersection()

Since we have resource_intersection() helper, let's utilize it here.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: Cezary Rojewski <cezary.rojewski@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/sound/soc/intel/catpt/core.h b/sound/soc/intel/catpt/core.h
index 88dc3fb6306f246ec6b662d3e1d43718d58fc19e..174ee5ad138b0baedcceaff105b592193e9780a0 100644 (file)
--- a/sound/soc/intel/catpt/core.h
+++ b/sound/soc/intel/catpt/core.h
@@ -22,17 +22,6 @@ void catpt_sram_free(struct resource *sram);
 struct resource *
 catpt_request_region(struct resource *root, resource_size_t size);
 
-static inline bool catpt_resource_overlapping(struct resource *r1,
-                                             struct resource *r2,
-                                             struct resource *ret)
-{
-       if (!resource_overlaps(r1, r2))
-               return false;
-       ret->start = max(r1->start, r2->start);
-       ret->end = min(r1->end, r2->end);
-       return true;
-}
-
 struct catpt_ipc_msg {
        union {
                u32 header;

diff --git a/sound/soc/intel/catpt/loader.c b/sound/soc/intel/catpt/loader.c
index 8a5f20abcadbc8b09789ffc8323aa74ec8757766..dbbbf15dded3844b963bbd58b075efb19b79f916 100644 (file)
--- a/sound/soc/intel/catpt/loader.c
+++ b/sound/soc/intel/catpt/loader.c
@@ -267,7 +267,7 @@ static int catpt_restore_fwimage(struct catpt_dev *cdev,
                r2.start = off;
                r2.end = r2.start + info->size - 1;
 
-               if (!catpt_resource_overlapping(&r2, &r1, &common))
+               if (!resource_intersection(&r2, &r1, &common))
                        continue;
                /* calculate start offset of common data area */
                off = common.start - r1.start;