[PATCH-resent-to-correct-ml 6/8] drm/xe/gsc: Use guard helper for xe_gsc_print_info.

[Maarten Lankhorst]

As an example on how it works.

Signed-off-by: Maarten Lankhorst <d...@lankhorst.se>
---
 drivers/gpu/drm/xe/xe_gsc.c | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/drivers/gpu/drm/xe/xe_gsc.c b/drivers/gpu/drm/xe/xe_gsc.c
index 1eb791ddc375c..aee9f58b1c3c6 100644
--- a/drivers/gpu/drm/xe/xe_gsc.c
+++ b/drivers/gpu/drm/xe/xe_gsc.c
@@ -600,7 +600,6 @@ void xe_gsc_print_info(struct xe_gsc *gsc, struct 
drm_printer *p)
 {
        struct xe_gt *gt = gsc_to_gt(gsc);
        struct xe_mmio *mmio = &gt->mmio;
-       unsigned int fw_ref;
 
        xe_uc_fw_print(&gsc->fw, p);
 
@@ -609,17 +608,12 @@ void xe_gsc_print_info(struct xe_gsc *gsc, struct 
drm_printer *p)
        if (!xe_uc_fw_is_enabled(&gsc->fw))
                return;
 
-       fw_ref = xe_force_wake_get(gt_to_fw(gt), XE_FW_GSC);
-       if (!fw_ref)
-               return;
-
-       drm_printf(p, "\nHECI1 FWSTS: 0x%08x 0x%08x 0x%08x 0x%08x 0x%08x 
0x%08x\n",
-                       xe_mmio_read32(mmio, HECI_FWSTS1(MTL_GSC_HECI1_BASE)),
-                       xe_mmio_read32(mmio, HECI_FWSTS2(MTL_GSC_HECI1_BASE)),
-                       xe_mmio_read32(mmio, HECI_FWSTS3(MTL_GSC_HECI1_BASE)),
-                       xe_mmio_read32(mmio, HECI_FWSTS4(MTL_GSC_HECI1_BASE)),
-                       xe_mmio_read32(mmio, HECI_FWSTS5(MTL_GSC_HECI1_BASE)),
-                       xe_mmio_read32(mmio, HECI_FWSTS6(MTL_GSC_HECI1_BASE)));
-
-       xe_force_wake_put(gt_to_fw(gt), fw_ref);
+       scoped_guard(xe_force_wake_get, gt_to_fw(gt), XE_FW_GSC)
+               drm_printf(p, "\nHECI1 FWSTS: 0x%08x 0x%08x 0x%08x 0x%08x 
0x%08x 0x%08x\n",
+                               xe_mmio_read32(mmio, 
HECI_FWSTS1(MTL_GSC_HECI1_BASE)),
+                               xe_mmio_read32(mmio, 
HECI_FWSTS2(MTL_GSC_HECI1_BASE)),
+                               xe_mmio_read32(mmio, 
HECI_FWSTS3(MTL_GSC_HECI1_BASE)),
+                               xe_mmio_read32(mmio, 
HECI_FWSTS4(MTL_GSC_HECI1_BASE)),
+                               xe_mmio_read32(mmio, 
HECI_FWSTS5(MTL_GSC_HECI1_BASE)),
+                               xe_mmio_read32(mmio, 
HECI_FWSTS6(MTL_GSC_HECI1_BASE)));
 }
-- 
2.47.1