From patchwork Mon Jun 20 15:53:10 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gustavo Padovan X-Patchwork-Id: 9187911 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 881F56075E for ; Mon, 20 Jun 2016 15:54:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7605E223B3 for ; Mon, 20 Jun 2016 15:54:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6A8262766D; Mon, 20 Jun 2016 15:54:17 +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=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 28494223B3 for ; Mon, 20 Jun 2016 15:54:17 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 590656E45B; Mon, 20 Jun 2016 15:54:13 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-yw0-f194.google.com (mail-yw0-f194.google.com [209.85.161.194]) by gabe.freedesktop.org (Postfix) with ESMTPS id 477DB6E14B for ; Mon, 20 Jun 2016 15:53:44 +0000 (UTC) Received: by mail-yw0-f194.google.com with SMTP id i12so2037740ywa.0 for ; Mon, 20 Jun 2016 08:53:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=4LcqgiNKmUBttpARmXACSik+S+mMczWsRB92UZ83R8Y=; b=D1TF+SNEkYa8Xsezy6rttGonuUJDu6UrBu1aHjP704naJhYZGbN5UgX0ugrmSq3zYe 1O3hwDikkY9LbLyEsggRaLbYB3vQqNzXpoMmA//YhTjw7SDe7d8KaWC30IQnK+FqjM62 Wz6C1rf6iQiNjDTOTLB6JHS5BLbby110UEmXQ79EytZTrklLed7BtOU3uEmyrE8rmHlu YuGYVx4UYvDmX6C+Xy0j/y0bffwXoiwqQDTu3I3vkt+fmqcVgCvynHiS5h/utpvoHqeM /ngcQIxG5y3nn+mDeCW6l6otsLSsBHOcpcV32X02HSUXMmtcpwabneC37n+Nv/Jo6B23 pNWg== X-Gm-Message-State: ALyK8tI74gdk077JWknZ+64kCBLtYtNP380FORZ1BB5ZwznG5h3c/t3PMkm7UviNYALidw== X-Received: by 10.37.114.9 with SMTP id n9mr9097569ybc.80.1466438018165; Mon, 20 Jun 2016 08:53:38 -0700 (PDT) Received: from jade.localdomain ([189.61.225.79]) by smtp.gmail.com with ESMTPSA id d205sm29098234ywe.49.2016.06.20.08.53.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 20 Jun 2016 08:53:37 -0700 (PDT) From: Gustavo Padovan To: Greg Kroah-Hartman Subject: [PATCH 4/7] staging/android: move trace/sync.h to sync_trace.h Date: Mon, 20 Jun 2016 12:53:10 -0300 Message-Id: <1466437993-21573-5-git-send-email-gustavo@padovan.org> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1466437993-21573-1-git-send-email-gustavo@padovan.org> References: <1466437993-21573-1-git-send-email-gustavo@padovan.org> Cc: devel@driverdev.osuosl.org, Daniel Stone , Daniel Vetter , Riley Andrews , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, =?UTF-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?= , Gustavo Padovan , John Harrison X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Gustavo Padovan The common behaviour for trace headers is to have them in the same folder they are used, instead of creating a special trace/ directory. Signed-off-by: Gustavo Padovan --- drivers/staging/android/sw_sync.c | 2 +- drivers/staging/android/{trace/sync.h => sync_trace.h} | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) rename drivers/staging/android/{trace/sync.h => sync_trace.h} (84%) diff --git a/drivers/staging/android/sw_sync.c b/drivers/staging/android/sw_sync.c index 66837ca..25196f5 100644 --- a/drivers/staging/android/sw_sync.c +++ b/drivers/staging/android/sw_sync.c @@ -23,7 +23,7 @@ #include "sync_debug.h" #define CREATE_TRACE_POINTS -#include "trace/sync.h" +#include "sync_trace.h" struct sw_sync_create_fence_data { __u32 value; diff --git a/drivers/staging/android/trace/sync.h b/drivers/staging/android/sync_trace.h similarity index 84% rename from drivers/staging/android/trace/sync.h rename to drivers/staging/android/sync_trace.h index 6b5ce96..ea485f7 100644 --- a/drivers/staging/android/trace/sync.h +++ b/drivers/staging/android/sync_trace.h @@ -1,11 +1,11 @@ #undef TRACE_SYSTEM -#define TRACE_INCLUDE_PATH ../../drivers/staging/android/trace -#define TRACE_SYSTEM sync +#define TRACE_INCLUDE_PATH ../../drivers/staging/android +#define TRACE_SYSTEM sync_trace #if !defined(_TRACE_SYNC_H) || defined(TRACE_HEADER_MULTI_READ) #define _TRACE_SYNC_H -#include "../sync_debug.h" +#include "sync_debug.h" #include TRACE_EVENT(sync_timeline,