From mboxrd@z Thu Jan 1 00:00:00 1970 From: Eric Engestrom Subject: Re: [PATCH v2 3/6] staging/android: move trace/sync.h to sync_trace.h Date: Thu, 11 Aug 2016 10:41:31 +0100 Message-ID: <20160811094131.GO10429@imgtec.com> References: <1470691462-19140-1-git-send-email-gustavo@padovan.org> <1470691462-19140-4-git-send-email-gustavo@padovan.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mailapp01.imgtec.com (mailapp01.imgtec.com [195.59.15.196]) by gabe.freedesktop.org (Postfix) with ESMTP id A18246E1AF for ; Thu, 11 Aug 2016 09:41:43 +0000 (UTC) Content-Disposition: inline In-Reply-To: <1470691462-19140-4-git-send-email-gustavo@padovan.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Gustavo Padovan Cc: devel@driverdev.osuosl.org, Daniel Stone , Greg Kroah-Hartman , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Riley Andrews , Arve =?utf-8?B?SGrDuG5uZXbDpWc=?= , pavel@ucw.cz, Daniel Vetter , Gustavo Padovan , John Harrison List-Id: dri-devel@lists.freedesktop.org T24gTW9uLCBBdWcgMDgsIDIwMTYgYXQgMDY6MjQ6MTlQTSAtMDMwMCwgR3VzdGF2byBQYWRvdmFu IHdyb3RlOgo+IEZyb206IEd1c3Rhdm8gUGFkb3ZhbiA8Z3VzdGF2by5wYWRvdmFuQGNvbGxhYm9y YS5jby51az4KPiAKPiBUaGUgY29tbW9uIGJlaGF2aW91ciBmb3IgdHJhY2UgaGVhZGVycyBpcyB0 byBoYXZlIHRoZW0gaW4gdGhlIHNhbWUgZm9sZGVyCj4gdGhleSBhcmUgdXNlZCwgaW5zdGVhZCBv ZiBjcmVhdGluZyBhIHNwZWNpYWwgdHJhY2UvIGRpcmVjdG9yeS4KPiAKPiBTaWduZWQtb2ZmLWJ5 OiBHdXN0YXZvIFBhZG92YW4gPGd1c3Rhdm8ucGFkb3ZhbkBjb2xsYWJvcmEuY28udWs+CgpSZXZp ZXdlZC1ieTogRXJpYyBFbmdlc3Ryb20gPGVyaWMuZW5nZXN0cm9tQGltZ3RlYy5jb20+Cgo+IC0t LQo+ICBkcml2ZXJzL3N0YWdpbmcvYW5kcm9pZC9zd19zeW5jLmMgICAgfCAgMiArLQo+ICBkcml2 ZXJzL3N0YWdpbmcvYW5kcm9pZC9zeW5jX3RyYWNlLmggfCAzMiArKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrKwo+ICBkcml2ZXJzL3N0YWdpbmcvYW5kcm9pZC90cmFjZS9zeW5jLmggfCAz MiAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQo+ICAzIGZpbGVzIGNoYW5nZWQsIDMz IGluc2VydGlvbnMoKyksIDMzIGRlbGV0aW9ucygtKQo+ICBjcmVhdGUgbW9kZSAxMDA2NDQgZHJp dmVycy9zdGFnaW5nL2FuZHJvaWQvc3luY190cmFjZS5oCj4gIGRlbGV0ZSBtb2RlIDEwMDY0NCBk cml2ZXJzL3N0YWdpbmcvYW5kcm9pZC90cmFjZS9zeW5jLmgKPiAKPiBkaWZmIC0tZ2l0IGEvZHJp dmVycy9zdGFnaW5nL2FuZHJvaWQvc3dfc3luYy5jIGIvZHJpdmVycy9zdGFnaW5nL2FuZHJvaWQv c3dfc3luYy5jCj4gaW5kZXggYWQwYmIxYS4uNzQ1NTk3YiAxMDA2NDQKPiAtLS0gYS9kcml2ZXJz L3N0YWdpbmcvYW5kcm9pZC9zd19zeW5jLmMKPiArKysgYi9kcml2ZXJzL3N0YWdpbmcvYW5kcm9p ZC9zd19zeW5jLmMKPiBAQCAtMjMsNyArMjMsNyBAQAo+ICAjaW5jbHVkZSAic3luY19kZWJ1Zy5o Igo+ICAKPiAgI2RlZmluZSBDUkVBVEVfVFJBQ0VfUE9JTlRTCj4gLSNpbmNsdWRlICJ0cmFjZS9z eW5jLmgiCj4gKyNpbmNsdWRlICJzeW5jX3RyYWNlLmgiCj4gIAo+ICBzdHJ1Y3Qgc3dfc3luY19j cmVhdGVfZmVuY2VfZGF0YSB7Cj4gIAlfX3UzMgl2YWx1ZTsKPiBkaWZmIC0tZ2l0IGEvZHJpdmVy cy9zdGFnaW5nL2FuZHJvaWQvc3luY190cmFjZS5oIGIvZHJpdmVycy9zdGFnaW5nL2FuZHJvaWQv c3luY190cmFjZS5oCj4gbmV3IGZpbGUgbW9kZSAxMDA2NDQKPiBpbmRleCAwMDAwMDAwLi5lYTQ4 NWY3Cj4gLS0tIC9kZXYvbnVsbAo+ICsrKyBiL2RyaXZlcnMvc3RhZ2luZy9hbmRyb2lkL3N5bmNf dHJhY2UuaAo+IEBAIC0wLDAgKzEsMzIgQEAKPiArI3VuZGVmIFRSQUNFX1NZU1RFTQo+ICsjZGVm aW5lIFRSQUNFX0lOQ0xVREVfUEFUSCAuLi8uLi9kcml2ZXJzL3N0YWdpbmcvYW5kcm9pZAo+ICsj ZGVmaW5lIFRSQUNFX1NZU1RFTSBzeW5jX3RyYWNlCj4gKwo+ICsjaWYgIWRlZmluZWQoX1RSQUNF X1NZTkNfSCkgfHwgZGVmaW5lZChUUkFDRV9IRUFERVJfTVVMVElfUkVBRCkKPiArI2RlZmluZSBf VFJBQ0VfU1lOQ19ICj4gKwo+ICsjaW5jbHVkZSAic3luY19kZWJ1Zy5oIgo+ICsjaW5jbHVkZSA8 bGludXgvdHJhY2Vwb2ludC5oPgo+ICsKPiArVFJBQ0VfRVZFTlQoc3luY190aW1lbGluZSwKPiAr CVRQX1BST1RPKHN0cnVjdCBzeW5jX3RpbWVsaW5lICp0aW1lbGluZSksCj4gKwo+ICsJVFBfQVJH Uyh0aW1lbGluZSksCj4gKwo+ICsJVFBfU1RSVUNUX19lbnRyeSgKPiArCQkJX19zdHJpbmcobmFt ZSwgdGltZWxpbmUtPm5hbWUpCj4gKwkJCV9fZmllbGQodTMyLCB2YWx1ZSkKPiArCSksCj4gKwo+ ICsJVFBfZmFzdF9hc3NpZ24oCj4gKwkJCV9fYXNzaWduX3N0cihuYW1lLCB0aW1lbGluZS0+bmFt ZSk7Cj4gKwkJCV9fZW50cnktPnZhbHVlID0gdGltZWxpbmUtPnZhbHVlOwo+ICsJKSwKPiArCj4g KwlUUF9wcmludGsoIm5hbWU9JXMgdmFsdWU9JWQiLCBfX2dldF9zdHIobmFtZSksIF9fZW50cnkt PnZhbHVlKQo+ICspOwo+ICsKPiArI2VuZGlmIC8qIGlmICFkZWZpbmVkKF9UUkFDRV9TWU5DX0gp IHx8IGRlZmluZWQoVFJBQ0VfSEVBREVSX01VTFRJX1JFQUQpICovCj4gKwo+ICsvKiBUaGlzIHBh cnQgbXVzdCBiZSBvdXRzaWRlIHByb3RlY3Rpb24gKi8KPiArI2luY2x1ZGUgPHRyYWNlL2RlZmlu ZV90cmFjZS5oPgo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL3N0YWdpbmcvYW5kcm9pZC90cmFjZS9z eW5jLmggYi9kcml2ZXJzL3N0YWdpbmcvYW5kcm9pZC90cmFjZS9zeW5jLmgKPiBkZWxldGVkIGZp bGUgbW9kZSAxMDA2NDQKPiBpbmRleCA2YjVjZTk2Li4wMDAwMDAwCj4gLS0tIGEvZHJpdmVycy9z dGFnaW5nL2FuZHJvaWQvdHJhY2Uvc3luYy5oCj4gKysrIC9kZXYvbnVsbAo+IEBAIC0xLDMyICsw LDAgQEAKPiAtI3VuZGVmIFRSQUNFX1NZU1RFTQo+IC0jZGVmaW5lIFRSQUNFX0lOQ0xVREVfUEFU SCAuLi8uLi9kcml2ZXJzL3N0YWdpbmcvYW5kcm9pZC90cmFjZQo+IC0jZGVmaW5lIFRSQUNFX1NZ U1RFTSBzeW5jCj4gLQo+IC0jaWYgIWRlZmluZWQoX1RSQUNFX1NZTkNfSCkgfHwgZGVmaW5lZChU UkFDRV9IRUFERVJfTVVMVElfUkVBRCkKPiAtI2RlZmluZSBfVFJBQ0VfU1lOQ19ICj4gLQo+IC0j aW5jbHVkZSAiLi4vc3luY19kZWJ1Zy5oIgo+IC0jaW5jbHVkZSA8bGludXgvdHJhY2Vwb2ludC5o Pgo+IC0KPiAtVFJBQ0VfRVZFTlQoc3luY190aW1lbGluZSwKPiAtCVRQX1BST1RPKHN0cnVjdCBz eW5jX3RpbWVsaW5lICp0aW1lbGluZSksCj4gLQo+IC0JVFBfQVJHUyh0aW1lbGluZSksCj4gLQo+ IC0JVFBfU1RSVUNUX19lbnRyeSgKPiAtCQkJX19zdHJpbmcobmFtZSwgdGltZWxpbmUtPm5hbWUp Cj4gLQkJCV9fZmllbGQodTMyLCB2YWx1ZSkKPiAtCSksCj4gLQo+IC0JVFBfZmFzdF9hc3NpZ24o Cj4gLQkJCV9fYXNzaWduX3N0cihuYW1lLCB0aW1lbGluZS0+bmFtZSk7Cj4gLQkJCV9fZW50cnkt PnZhbHVlID0gdGltZWxpbmUtPnZhbHVlOwo+IC0JKSwKPiAtCj4gLQlUUF9wcmludGsoIm5hbWU9 JXMgdmFsdWU9JWQiLCBfX2dldF9zdHIobmFtZSksIF9fZW50cnktPnZhbHVlKQo+IC0pOwo+IC0K PiAtI2VuZGlmIC8qIGlmICFkZWZpbmVkKF9UUkFDRV9TWU5DX0gpIHx8IGRlZmluZWQoVFJBQ0Vf SEVBREVSX01VTFRJX1JFQUQpICovCj4gLQo+IC0vKiBUaGlzIHBhcnQgbXVzdCBiZSBvdXRzaWRl IHByb3RlY3Rpb24gKi8KPiAtI2luY2x1ZGUgPHRyYWNlL2RlZmluZV90cmFjZS5oPgo+IC0tIAo+ IDIuNS41Cl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRy aS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRw czovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932899AbcHKJlr (ORCPT ); Thu, 11 Aug 2016 05:41:47 -0400 Received: from mailapp01.imgtec.com ([195.59.15.196]:58735 "EHLO mailapp01.imgtec.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932105AbcHKJlo (ORCPT ); Thu, 11 Aug 2016 05:41:44 -0400 Date: Thu, 11 Aug 2016 10:41:31 +0100 From: Eric Engestrom To: Gustavo Padovan CC: Greg Kroah-Hartman , , Daniel Stone , "Daniel Vetter" , Riley Andrews , , , Arve =?utf-8?B?SGrDuG5uZXbDpWc=?= , , "Gustavo Padovan" , John Harrison Subject: Re: [PATCH v2 3/6] staging/android: move trace/sync.h to sync_trace.h Message-ID: <20160811094131.GO10429@imgtec.com> References: <1470691462-19140-1-git-send-email-gustavo@padovan.org> <1470691462-19140-4-git-send-email-gustavo@padovan.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Disposition: inline In-Reply-To: <1470691462-19140-4-git-send-email-gustavo@padovan.org> User-Agent: Mutt/1.6.2 (2016-07-01) X-Originating-IP: [10.60.4.28] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Aug 08, 2016 at 06:24:19PM -0300, Gustavo Padovan wrote: > 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/sync_trace.h | 32 ++++++++++++++++++++++++++++++++ > drivers/staging/android/trace/sync.h | 32 -------------------------------- > 3 files changed, 33 insertions(+), 33 deletions(-) > create mode 100644 drivers/staging/android/sync_trace.h > delete mode 100644 drivers/staging/android/trace/sync.h > > diff --git a/drivers/staging/android/sw_sync.c b/drivers/staging/android/sw_sync.c > index ad0bb1a..745597b 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/sync_trace.h b/drivers/staging/android/sync_trace.h > new file mode 100644 > index 0000000..ea485f7 > --- /dev/null > +++ b/drivers/staging/android/sync_trace.h > @@ -0,0 +1,32 @@ > +#undef TRACE_SYSTEM > +#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 > + > +TRACE_EVENT(sync_timeline, > + TP_PROTO(struct sync_timeline *timeline), > + > + TP_ARGS(timeline), > + > + TP_STRUCT__entry( > + __string(name, timeline->name) > + __field(u32, value) > + ), > + > + TP_fast_assign( > + __assign_str(name, timeline->name); > + __entry->value = timeline->value; > + ), > + > + TP_printk("name=%s value=%d", __get_str(name), __entry->value) > +); > + > +#endif /* if !defined(_TRACE_SYNC_H) || defined(TRACE_HEADER_MULTI_READ) */ > + > +/* This part must be outside protection */ > +#include > diff --git a/drivers/staging/android/trace/sync.h b/drivers/staging/android/trace/sync.h > deleted file mode 100644 > index 6b5ce96..0000000 > --- a/drivers/staging/android/trace/sync.h > +++ /dev/null > @@ -1,32 +0,0 @@ > -#undef TRACE_SYSTEM > -#define TRACE_INCLUDE_PATH ../../drivers/staging/android/trace > -#define TRACE_SYSTEM sync > - > -#if !defined(_TRACE_SYNC_H) || defined(TRACE_HEADER_MULTI_READ) > -#define _TRACE_SYNC_H > - > -#include "../sync_debug.h" > -#include > - > -TRACE_EVENT(sync_timeline, > - TP_PROTO(struct sync_timeline *timeline), > - > - TP_ARGS(timeline), > - > - TP_STRUCT__entry( > - __string(name, timeline->name) > - __field(u32, value) > - ), > - > - TP_fast_assign( > - __assign_str(name, timeline->name); > - __entry->value = timeline->value; > - ), > - > - TP_printk("name=%s value=%d", __get_str(name), __entry->value) > -); > - > -#endif /* if !defined(_TRACE_SYNC_H) || defined(TRACE_HEADER_MULTI_READ) */ > - > -/* This part must be outside protection */ > -#include > -- > 2.5.5