[RFC 2/3] drm/xe: Use new FW guard in xe_mocs.c

[Michal Wajdeczko <michal.wajdeczko@intel.com>]

Start using new FW guard to minimize risk of leaking force-wake
references.

Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
---
 drivers/gpu/drm/xe/xe_mocs.c | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/drivers/gpu/drm/xe/xe_mocs.c b/drivers/gpu/drm/xe/xe_mocs.c
index de3f2d3f1b04..f863e149d61d 100644
--- a/drivers/gpu/drm/xe/xe_mocs.c
+++ b/drivers/gpu/drm/xe/xe_mocs.c
@@ -774,7 +774,6 @@ void xe_mocs_dump(struct xe_gt *gt, struct drm_printer *p)
 {
 	struct xe_mocs_info table;
 	unsigned int flags;
-	u32 ret;
 	struct xe_device *xe = gt_to_xe(gt);
 
 	flags = get_mocs_settings(xe, &table);
@@ -783,17 +782,10 @@ void xe_mocs_dump(struct xe_gt *gt, struct drm_printer *p)
 		return;
 
 	xe_pm_runtime_get_noresume(xe);
-	ret = xe_force_wake_get(gt_to_fw(gt), XE_FW_GT);
 
-	if (ret)
-		goto err_fw;
+	scoped_guard(xe_fw, gt_to_fw(gt), XE_FW_GT)
+		table.ops->dump(&table, flags, gt, p);
 
-	table.ops->dump(&table, flags, gt, p);
-
-	xe_force_wake_put(gt_to_fw(gt), XE_FW_GT);
-
-err_fw:
-	xe_assert(xe, !ret);
 	xe_pm_runtime_put(xe);
 }
 
-- 
2.43.0