From patchwork Thu Aug 11 15:26:41 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gustavo Padovan X-Patchwork-Id: 9275411 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 95FCF60231 for ; Thu, 11 Aug 2016 15:27:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 87E96286EC for ; Thu, 11 Aug 2016 15:27:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7CB14286EE; Thu, 11 Aug 2016 15:27:02 +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]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 0851B286EC for ; Thu, 11 Aug 2016 15:27:01 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 566CB6E956; Thu, 11 Aug 2016 15:27:01 +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 0BFAF6E956 for ; Thu, 11 Aug 2016 15:27:00 +0000 (UTC) Received: by mail-yw0-f194.google.com with SMTP id r9so306461ywg.2 for ; Thu, 11 Aug 2016 08:27:00 -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=zcdVAWrqg47wT5RkpPZF5ii9q7yU5HrB6P8rlYO5AwY=; b=GJPlWUsHO1WgORwDGb+c0hBfoSGMRqcxEbyl1W99XQs9CQeJAg+miCAjeKPSTo0UX7 JZkG58okeLh9pzDK5xQ0zCE5KJjqYlXrQFFkvuif9qvOFyNOSwxR/crbj7/pnH0lKIaW bY+bB+AH9y0B8a7xkBYlAB+mCYQbaNbzB1JEVTmIhre3XJRfmI4gSiEQWidoeZdYw8e7 S8sdBUYnefL5bQFFAyHH1tLLXtEhmavU01LX2maeg5G/dj4HtAzDfVFc9tpOKKczLTnV a9vBn2V7+qpP1GDoD1FjG/Ggeod7fLSkZtsWZ9dyAfdCZ8WnwzBCdXiOWm4O88Di0Ekq D9MA== X-Gm-Message-State: AEkoous9bDf8u3OpobvLas9LmyspRR8wEDgJkBdJhyOQO6bg/C2AKL/MpXgZbdzWBF7Mpw== X-Received: by 10.129.97.70 with SMTP id v67mr2208285ywb.206.1470929219269; Thu, 11 Aug 2016 08:26:59 -0700 (PDT) Received: from jade.localdomain ([201.82.189.183]) by smtp.gmail.com with ESMTPSA id r124sm1180691ywg.50.2016.08.11.08.26.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 11 Aug 2016 08:26:58 -0700 (PDT) From: Gustavo Padovan To: Greg Kroah-Hartman Subject: [PATCH v3 2/5] staging/android: move trace/sync.h to sync_trace.h Date: Thu, 11 Aug 2016 12:26:41 -0300 Message-Id: <1470929204-13237-3-git-send-email-gustavo@padovan.org> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1470929204-13237-1-git-send-email-gustavo@padovan.org> References: <1470929204-13237-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?= , pavel@ucw.cz, 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 Reviewed-by: Eric Engestrom --- 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 bda1f6a..92c1f8b 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,