From patchwork Thu Dec 2 13:20:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Gardner X-Patchwork-Id: 1562720 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=oKp9EkRo; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4J4c5x5g2Kz9s1l for ; Fri, 3 Dec 2021 00:20:53 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1msm0z-0001uE-Rt; Thu, 02 Dec 2021 13:20:45 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1msm0r-0001f6-Pv for kernel-team@lists.ubuntu.com; Thu, 02 Dec 2021 13:20:37 +0000 Received: from mail-pf1-f200.google.com (mail-pf1-f200.google.com [209.85.210.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 66D0F3F1B1 for ; Thu, 2 Dec 2021 13:20:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1638451236; bh=VRwT8gojvqDbxUZr1DO1Jg9ooXCYZM6sRtWeV9yZIOY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=oKp9EkRoO9BjcD0eMUKuIewBTqkucycFAJ99THpdMh5ejrWbFX2EMCs+GwcDp4hqB JSPPgUGiFo8BU/I94ccC09S7Lf3in1LqPgXYVF5LIUtogL13bHmbWVLpZhqacgF94o vxQn93zIZ3U7Xqirm14ooTal8keiRD1eW2kcVwSym9EbGU6W7tw6DsEGAm/ahF0rip G3M+ma65532ezL1uhjQfgJ28jlwlkrBUulh5uaeSxLR83PNQqxv6vKsWGvJHE96yP8 ocDQp9ptfg7Cpq9aLPJNI7/vkjDDMXKvzHdW+KXQ/DLLZcI9DFS/tOKBtHcc+07U4F hCACyVsflN95A== Received: by mail-pf1-f200.google.com with SMTP id f206-20020a6238d7000000b004a02dd7156bso17417379pfa.5 for ; Thu, 02 Dec 2021 05:20:36 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=VRwT8gojvqDbxUZr1DO1Jg9ooXCYZM6sRtWeV9yZIOY=; b=NCj8iXQQAJMFnNMQ6X/t0xMTMCKHCqJQ0T1UFsqxLLY7Hr1dKUWCDvFJqONLdua3yZ IX2V0pe/HJI3PHiNEojO0EjWJMpkluZ+WcbVmrKlAhEVuI91Znr9lCKJ8FAmVoifrBoh W8vSpUP5Rkv/jZfWCWkQo2SkbaTcjugToAKvvYTTiSXlOlbZ30QMobl5rsUHaXYe4uJ2 KRHE4F3Sq6VXHrqTpvl96PrDl6Kdqos2QN0kDmK+5dR3tt9ug9IdX0xihmeg/JKM7n9J NufZUzbn/o8Kps4VvVZI0t0MMYPptO+AF5gZnbf/ZuWl56Cl3FuCevzGNxf0jd+y6Qnc 6Ocg== X-Gm-Message-State: AOAM533Fl49QEvSeBLBDBCsTlrSZ3Uu4m23BIh/WKawoe6yDrHMd6TuB g6B7sIrR0XwVqdqLqD4Ut+T/mE88LHcHIv2ddZQzXN+ljFPkiCxhkqcUWix0/cFSVwykZs3GArP HWIAqE4wQRFAeqlmpdMsYV64YQbNR5Aihi5ar/H97Uw== X-Received: by 2002:a17:902:e9c6:b0:141:c588:99b2 with SMTP id 6-20020a170902e9c600b00141c58899b2mr15222608plk.63.1638451234398; Thu, 02 Dec 2021 05:20:34 -0800 (PST) X-Google-Smtp-Source: ABdhPJxhgm0YgSrljdwjhOme6HyA6OSGcjr0EwWVesu8YlgTsVjkp0DRh4uULoSDZs7deA18fW5M7Q== X-Received: by 2002:a17:902:e9c6:b0:141:c588:99b2 with SMTP id 6-20020a170902e9c600b00141c58899b2mr15222587plk.63.1638451234143; Thu, 02 Dec 2021 05:20:34 -0800 (PST) Received: from localhost.localdomain ([69.163.84.166]) by smtp.gmail.com with ESMTPSA id r6sm2762803pjg.21.2021.12.02.05.20.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Dec 2021 05:20:33 -0800 (PST) From: Tim Gardner To: kernel-team@lists.ubuntu.com Subject: [PATCH 9/9] nitro_enclaves: Add fixes for checkpatch blank line reports Date: Thu, 2 Dec 2021 06:20:17 -0700 Message-Id: <20211202132017.9688-10-tim.gardner@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20211202132017.9688-1-tim.gardner@canonical.com> References: <20211202132017.9688-1-tim.gardner@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Andra Paraschiv BugLink: https://bugs.launchpad.net/bugs/1951873 Remove blank lines that are not necessary, fixing the checkpatch script reports. While at it, add a blank line after the switch default block, similar to the other parts of the codebase. Reviewed-by: George-Aurelian Popescu Signed-off-by: Andra Paraschiv Link: https://lore.kernel.org/r/20210827154930.40608-8-andraprs@amazon.com Signed-off-by: Greg Kroah-Hartman (cherry picked from commit da1c396a81b87541cf7a7c2c6e128b722461a1c8) Signed-off-by: Tim Gardner --- samples/nitro_enclaves/ne_ioctl_sample.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/samples/nitro_enclaves/ne_ioctl_sample.c b/samples/nitro_enclaves/ne_ioctl_sample.c index 6a60990b2e20..765b131c7319 100644 --- a/samples/nitro_enclaves/ne_ioctl_sample.c +++ b/samples/nitro_enclaves/ne_ioctl_sample.c @@ -185,7 +185,6 @@ static int ne_create_vm(int ne_dev_fd, unsigned long *slot_uid, int *enclave_fd) return 0; } - /** * ne_poll_enclave_fd() - Thread function for polling the enclave fd. * @data: Argument provided for the polling function. @@ -560,8 +559,8 @@ static int ne_add_vcpu(int enclave_fd, unsigned int *vcpu_id) default: printf("Error in add vcpu [%m]\n"); - } + return rc; }