From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932524Ab1E0IqF (ORCPT ); Fri, 27 May 2011 04:46:05 -0400 Received: from qmta13.emeryville.ca.mail.comcast.net ([76.96.27.243]:48713 "EHLO qmta13.emeryville.ca.mail.comcast.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758747Ab1E0Iom (ORCPT ); Fri, 27 May 2011 04:44:42 -0400 From: matt mooney To: Greg Kroah-Hartman Cc: usbip-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org Subject: [PATCH 2/6] staging: usbip: userspace: move header includes out utils.h Date: Fri, 27 May 2011 01:44:11 -0700 Message-Id: X-Mailer: git-send-email 1.7.5.1 In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The includes have been moved out of utils.h to their respective source files where they are suppose to be. An include guard is also added to utils.h Signed-off-by: matt mooney --- drivers/staging/usbip/userspace/src/usbip_bind.c | 3 +- drivers/staging/usbip/userspace/src/utils.c | 6 ++++- drivers/staging/usbip/userspace/src/utils.h | 25 +++------------------ 3 files changed, 11 insertions(+), 23 deletions(-) diff --git a/drivers/staging/usbip/userspace/src/usbip_bind.c b/drivers/staging/usbip/userspace/src/usbip_bind.c index 26cfbad..9869db2 100644 --- a/drivers/staging/usbip/userspace/src/usbip_bind.c +++ b/drivers/staging/usbip/userspace/src/usbip_bind.c @@ -18,11 +18,12 @@ #include +#include #include #include -#include #include +#include #include #include "usbip_common.h" diff --git a/drivers/staging/usbip/userspace/src/utils.c b/drivers/staging/usbip/userspace/src/utils.c index 35b05e4..6dbfdbd 100644 --- a/drivers/staging/usbip/userspace/src/utils.c +++ b/drivers/staging/usbip/userspace/src/utils.c @@ -4,9 +4,13 @@ */ #include + +#include +#include +#include + #include #include -#include #include #include "usbip_common.h" diff --git a/drivers/staging/usbip/userspace/src/utils.h b/drivers/staging/usbip/userspace/src/utils.h index 423716d..36ee8d5 100644 --- a/drivers/staging/usbip/userspace/src/utils.h +++ b/drivers/staging/usbip/userspace/src/utils.h @@ -1,26 +1,7 @@ +#ifndef __UTILS_H +#define __UTILS_H -#ifdef HAVE_CONFIG_H -#include "../config.h" -#endif - -#define _GNU_SOURCE -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include #include -#include -#include - - /* Be sync to kernel header */ #define BUS_ID_SIZE 20 @@ -37,3 +18,5 @@ int write_bConfigurationValue(char *busid, int config); int read_bDeviceClass(char *busid); int readline(int sockfd, char *str, int strlen); int writeline(int sockfd, char *buff, int bufflen); + +#endif /* __UTILS_H */ -- 1.7.5.1