virt/coco/sev-guest: Remove the disable_vmpck label in handle_guest_request()

commit ebc750614a386d9c0d7fbb4bb53711bd00e7d406 upstream.

Call the function directly instead.

No functional changes.

Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
Reviewed-by: Tom Lendacky <thomas.lendacky@amd.com>
Link: https://lore.kernel.org/r/20230307192449.24732-5-bp@alien8.de
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/virt/coco/sev-guest/sev-guest.c b/drivers/virt/coco/sev-guest/sev-guest.c
index 2fac7f712158330f41050d1c22c21d2808d7cf75..fbbc0da15a91752adfdd5caf816caee57f38c316 100644 (file)
--- a/drivers/virt/coco/sev-guest/sev-guest.c
+++ b/drivers/virt/coco/sev-guest/sev-guest.c
@@ -407,7 +407,8 @@ retry_request:
                dev_alert(snp_dev->dev,
                          "Detected error from ASP request. rc: %d, fw_err: %llu\n",
                          rc, *fw_err);
-               goto disable_vmpck;
+               snp_disable_vmpck(snp_dev);
+               return rc;
        }
 
        rc = verify_and_dec_payload(snp_dev, resp_buf, resp_sz);
@@ -415,14 +416,11 @@ retry_request:
                dev_alert(snp_dev->dev,
                          "Detected unexpected decode failure from ASP. rc: %d\n",
                          rc);
-               goto disable_vmpck;
+               snp_disable_vmpck(snp_dev);
+               return rc;
        }
 
        return 0;
-
-disable_vmpck:
-       snp_disable_vmpck(snp_dev);
-       return rc;
 }
 
 static int get_report(struct snp_guest_dev *snp_dev, struct snp_guest_request_ioctl *arg)