From patchwork Wed Apr 11 12:54:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Thi=C3=A9baud_Weksteen?= X-Patchwork-Id: 10335421 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 7E4986053B for ; Wed, 11 Apr 2018 12:56:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5D5952894A for ; Wed, 11 Apr 2018 12:56:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 51F1A2894C; Wed, 11 Apr 2018 12:56:53 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D9DB02894A for ; Wed, 11 Apr 2018 12:56:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753353AbeDKMzt (ORCPT ); Wed, 11 Apr 2018 08:55:49 -0400 Received: from mail-qt0-f202.google.com ([209.85.216.202]:40651 "EHLO mail-qt0-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753101AbeDKMzp (ORCPT ); Wed, 11 Apr 2018 08:55:45 -0400 Received: by mail-qt0-f202.google.com with SMTP id d5so1200046qtg.7 for ; Wed, 11 Apr 2018 05:55:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:date:in-reply-to:message-id:references:subject:from:to :cc; bh=AHVjHaqk1MtDPIQLve1qn9K9LmbAnjxv35FmyYV44Mg=; b=kh9wnESYVwNba+IAdjINIuZRgwWNc8qnoVIV3MaTReUFcpQQzhsMRVzBMYVa07H0bS 4B/+cAmUqj29cm7+QXXKwyD472+rCB1rrv8PWlJHqmRyqMfqgagz5f52pKUO6+/mj2fv E+rU6N5WHrn0isP7QA1OwMINuebAKhME3z+RKkkZBgBBpLxdSRdiOL4YWYJaM+Dk26jL fUsbSfR+cRgQ3R0W7Cg31e7tLox4BogkIXi6LamLHluF7JrrEGgWQinE+Wmi077PzqDD ShmK2jQZi9OnkFiHP/k22xfHJkjgHO5gAH38AbwGeWQXj3+4nHXqc3CjGZfwpqBm8cWE 72gw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:date:in-reply-to:message-id :references:subject:from:to:cc; bh=AHVjHaqk1MtDPIQLve1qn9K9LmbAnjxv35FmyYV44Mg=; b=fyUl8u9deW8ZM+a1tiJhBeSJkjqt1RZBKsvzjW4WTPt604pfkgvNZIkodhNecdRPyB 9wo2Hl4XrNRy+/FMSjDLAok5J1PEKHbY0DdYKXzReZfmIWJUsvoyDx0wIhAS61eIF+qs Vd49k+t7D+3RoigMegPuBmT/XPl7HtIhKIy5fz3PMg8Ra6KphzPoyx4BGnvkLrisQfKC 4CtcsaZeOH4DgD0KleBjoZmqMvbjAhetkfWaAFf0Vv7Qje9N2uQuCbOithedRqR0cehY nav88sQ5axzFPgb0ysGqYdV5VtffN2CvnZwAU2WvhxdCBPFvFDHXvDYxbj9BH99aOFGC yD7Q== X-Gm-Message-State: ALQs6tBsI5QJf14UiFdYi5mHW6vO5DbTtrrjkuK3SNCDKsoZrBdHxnXf sAbOIuT1yW++BF+BuOK00v/Vnx5saw== X-Google-Smtp-Source: AIpwx48sFtIdNnohqRcQZSIteiPo4t1b/CUgLYr6cvw9sy8pxq5jIzudrZiQzAYohvIplhw92BXbgIunAA== MIME-Version: 1.0 X-Received: by 10.55.75.139 with SMTP id y133mr3014987qka.16.1523451344372; Wed, 11 Apr 2018 05:55:44 -0700 (PDT) Date: Wed, 11 Apr 2018 14:54:59 +0200 In-Reply-To: <20180411125501.188477-1-tweek@google.com> Message-Id: <20180411125501.188477-2-tweek@google.com> References: <20180411125501.188477-1-tweek@google.com> X-Mailer: git-send-email 2.17.0.484.g0c8726318c-goog Subject: [PATCH 1/3] tpm: Move eventlog files to a subdirectory From: Thiebaud Weksteen To: jarkko.sakkinen@linux.intel.com, nayna@linux.vnet.ibm.com, linux-integrity@vger.kernel.org, linux-kernel@vger.kernel.org, tweek@google.com Cc: linux-integrity@vger.kernel.org, linux-kernel@vger.kernel.org, Thiebaud Weksteen Sender: linux-integrity-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-integrity@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Thiebaud Weksteen --- drivers/char/tpm/Makefile | 8 ++++---- drivers/char/tpm/{tpm_eventlog_acpi.c => eventlog/acpi.c} | 2 +- drivers/char/tpm/{tpm_eventlog_efi.c => eventlog/efi.c} | 2 +- drivers/char/tpm/{tpm_eventlog_of.c => eventlog/of.c} | 2 +- drivers/char/tpm/{tpm1_eventlog.c => eventlog/tpm1.c} | 2 +- drivers/char/tpm/{tpm2_eventlog.c => eventlog/tpm2.c} | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) rename drivers/char/tpm/{tpm_eventlog_acpi.c => eventlog/acpi.c} (99%) rename drivers/char/tpm/{tpm_eventlog_efi.c => eventlog/efi.c} (98%) rename drivers/char/tpm/{tpm_eventlog_of.c => eventlog/of.c} (99%) rename drivers/char/tpm/{tpm1_eventlog.c => eventlog/tpm1.c} (99%) rename drivers/char/tpm/{tpm2_eventlog.c => eventlog/tpm2.c} (99%) diff --git a/drivers/char/tpm/Makefile b/drivers/char/tpm/Makefile index acd758381c58..5dcf5bd35a3d 100644 --- a/drivers/char/tpm/Makefile +++ b/drivers/char/tpm/Makefile @@ -4,11 +4,11 @@ # obj-$(CONFIG_TCG_TPM) += tpm.o tpm-y := tpm-interface.o tpm-dev.o tpm-sysfs.o tpm-chip.o tpm2-cmd.o \ - tpm-dev-common.o tpmrm-dev.o tpm1_eventlog.o tpm2_eventlog.o \ + tpm-dev-common.o tpmrm-dev.o eventlog/tpm1.o eventlog/tpm2.o \ tpm2-space.o -tpm-$(CONFIG_ACPI) += tpm_ppi.o tpm_eventlog_acpi.o -tpm-$(CONFIG_EFI) += tpm_eventlog_efi.o -tpm-$(CONFIG_OF) += tpm_eventlog_of.o +tpm-$(CONFIG_ACPI) += tpm_ppi.o eventlog/acpi.o +tpm-$(CONFIG_EFI) += eventlog/efi.o +tpm-$(CONFIG_OF) += eventlog/of.o obj-$(CONFIG_TCG_TIS_CORE) += tpm_tis_core.o obj-$(CONFIG_TCG_TIS) += tpm_tis.o obj-$(CONFIG_TCG_TIS_SPI) += tpm_tis_spi.o diff --git a/drivers/char/tpm/tpm_eventlog_acpi.c b/drivers/char/tpm/eventlog/acpi.c similarity index 99% rename from drivers/char/tpm/tpm_eventlog_acpi.c rename to drivers/char/tpm/eventlog/acpi.c index 66f19e93c216..8476be2e9526 100644 --- a/drivers/char/tpm/tpm_eventlog_acpi.c +++ b/drivers/char/tpm/eventlog/acpi.c @@ -27,7 +27,7 @@ #include #include -#include "tpm.h" +#include "../tpm.h" struct acpi_tcpa { struct acpi_table_header hdr; diff --git a/drivers/char/tpm/tpm_eventlog_efi.c b/drivers/char/tpm/eventlog/efi.c similarity index 98% rename from drivers/char/tpm/tpm_eventlog_efi.c rename to drivers/char/tpm/eventlog/efi.c index e3f9ffd341d2..e1593c5271a4 100644 --- a/drivers/char/tpm/tpm_eventlog_efi.c +++ b/drivers/char/tpm/eventlog/efi.c @@ -14,7 +14,7 @@ #include #include -#include "tpm.h" +#include "../tpm.h" /* read binary bios log from EFI configuration table */ int tpm_read_log_efi(struct tpm_chip *chip) diff --git a/drivers/char/tpm/tpm_eventlog_of.c b/drivers/char/tpm/eventlog/of.c similarity index 99% rename from drivers/char/tpm/tpm_eventlog_of.c rename to drivers/char/tpm/eventlog/of.c index 96fd5646f866..c38c37e41389 100644 --- a/drivers/char/tpm/tpm_eventlog_of.c +++ b/drivers/char/tpm/eventlog/of.c @@ -19,7 +19,7 @@ #include #include -#include "tpm.h" +#include "../tpm.h" int tpm_read_log_of(struct tpm_chip *chip) { diff --git a/drivers/char/tpm/tpm1_eventlog.c b/drivers/char/tpm/eventlog/tpm1.c similarity index 99% rename from drivers/char/tpm/tpm1_eventlog.c rename to drivers/char/tpm/eventlog/tpm1.c index add798bd69d0..d6aea3ca950e 100644 --- a/drivers/char/tpm/tpm1_eventlog.c +++ b/drivers/char/tpm/eventlog/tpm1.c @@ -28,7 +28,7 @@ #include #include -#include "tpm.h" +#include "../tpm.h" static const char* tcpa_event_type_strings[] = { diff --git a/drivers/char/tpm/tpm2_eventlog.c b/drivers/char/tpm/eventlog/tpm2.c similarity index 99% rename from drivers/char/tpm/tpm2_eventlog.c rename to drivers/char/tpm/eventlog/tpm2.c index 1ce4411292ba..f0723fa9ae14 100644 --- a/drivers/char/tpm/tpm2_eventlog.c +++ b/drivers/char/tpm/eventlog/tpm2.c @@ -23,7 +23,7 @@ #include #include -#include "tpm.h" +#include "../tpm.h" /* * calc_tpm2_event_size() - calculate the event size, where event