Re: [PATCH v2 1/2] USB: ffs-test: fix header path

[Davidlohr Bueso <dave@gnu.org>]

On Thu, 2011-02-17 at 11:05 -0800, Greg KH wrote:
> On Thu, Feb 17, 2011 at 03:57:32PM -0300, Davidlohr Bueso wrote:
> > On Thu, 2011-02-17 at 10:42 -0800, Greg KH wrote:
> > > On Sun, Feb 06, 2011 at 02:13:33PM -0300, Davidlohr Bueso wrote:
> > > > From: Davidlohr Bueso <dave@gnu.org>
> > > > 
> > > > When compiling this program the functionfs.h header cannot be found, producing:
> > > > ffs-test.c:40: fatal error: linux/usb/functionfs.h: No such file or directory
> > > > 
> > > > This patch also fixes the following warning:
> > > > ffs-test.c:453: warning: format ‘%4d’ expects type ‘int’, but argument 3 has type ‘size_t’
> > > > 
> > > > Signed-off-by: Davidlohr Bueso <dave@gnu.org>
> > > > ---
> > > >  tools/usb/ffs-test.c |    4 ++--
> > > >  1 files changed, 2 insertions(+), 2 deletions(-)
> > > 
> > > This patch doesn't apply properly to the linux-next branch, what did you
> > > make it against?
> > > 
> > 
> > It was against Linus' tree (did a pull right before submitting the
> > patch).
> 
> Ah, so you think this is needed for Linus's tree now?  Care to resend it
> and I'll queue it up to the proper tree, sorry, I missed that.
> 
Sorry about the delay, you wouldn't believe the problems I have with a
slow ('90s) internet connection when trying to clone a tree. Here is a
version against the latest linux-next. Thanks.

From: Davidlohr Bueso <dave@gnu.org>
Date: Sun, 27 Feb 2011 04:55:59 -0300
Subject: [PATCH] USB: ffs-test: fix header path

When compiling this program the functionfs.h header cannot be found, producing:
ffs-test.c:40: fatal error: linux/usb/functionfs.h: No such file or directory

This patch also fixes the following warning:
ffs-test.c:453: warning: format ‘%4d’ expects type ‘int’, but argument 3 has type ‘size_t’

Signed-off-by: Davidlohr Bueso <dave@gnu.org>
---
 tools/usb/ffs-test.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/usb/ffs-test.c b/tools/usb/ffs-test.c
index bbe2e3a..b9c7986 100644
--- a/tools/usb/ffs-test.c
+++ b/tools/usb/ffs-test.c
@@ -37,7 +37,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include <linux/usb/functionfs.h>
+#include "../../include/linux/usb/functionfs.h"
 
 
 /******************** Little Endian Handling ********************************/
@@ -450,7 +450,7 @@ invalid:
 		    len, expected, *p);
 		for (p = buf, len = 0; len < nbytes; ++p, ++len) {
 			if (0 == (len % 32))
-				fprintf(stderr, "%4d:", len);
+				fprintf(stderr, "%4zd:", len);
 			fprintf(stderr, " %02x", *p);
 			if (31 == (len % 32))
 				fprintf(stderr, "\n");
-- 
1.7.1