Commit 099f79fa authored by matt mooney's avatar matt mooney Committed by Greg Kroah-Hartman
Browse files

staging: usbip: userspace: libsrc: remove usbip.h 



Remove the library version of usbip.h because its sole purpose was to
include other headers, which is bad practice. Also modify include
guards for consistency.

Signed-off-by: default avatarmatt mooney <mfm@muteddisk.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent c93be5b1

drivers/staging/usbip/userspace/Makefile.am

+1 −1
Original line number Diff line number Diff line 
SUBDIRS := libsrc src

includedir := @includedir@/usbip

include_HEADERS := $(addprefix libsrc/, \

		     usbip.h usbip_common.h vhci_driver.h stub_driver.h)

		     usbip_common.h vhci_driver.h stub_driver.h)



dist_man_MANS := $(addprefix doc/, usbip.8 usbipd.8 usbip_bind_driver.8)

drivers/staging/usbip/userspace/libsrc/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -3,5 +3,5 @@ libusbip_la_CFLAGS := @EXTRA_CFLAGS@ 
libusbip_la_LDFLAGS  := -version-info @LIBUSBIP_VERSION@



lib_LTLIBRARIES := libusbip.la

libusbip_la_SOURCES := names.c names.h stub_driver.c stub_driver.h usbip.h \

libusbip_la_SOURCES := names.c names.h stub_driver.c stub_driver.h \

		       usbip_common.c usbip_common.h vhci_driver.c vhci_driver.h

drivers/staging/usbip/userspace/libsrc/stub_driver.c

+2 −1
Original line number Diff line number Diff line
@@ -8,7 +8,8 @@ 
#include <errno.h>

#include <unistd.h>



#include "usbip.h"

#include "usbip_common.h"

#include "stub_driver.h"



#undef  PROGNAME

#define PROGNAME "libusbip"

drivers/staging/usbip/userspace/libsrc/stub_driver.h

+6 −5
Original line number Diff line number Diff line
@@ -2,11 +2,11 @@ 
 * Copyright (C) 2005-2007 Takahiro Hirofuchi

 */



#ifndef _USBIP_STUB_DRIVER_H

#define _USBIP_STUB_DRIVER_H



#include "usbip.h"

#ifndef __USBIP_STUB_DRIVER_H

#define __USBIP_STUB_DRIVER_H



#include <stdint.h>

#include "usbip_common.h"



struct usbip_stub_driver {

	int ndevs;
@@ -33,4 +33,5 @@ int usbip_stub_refresh_device_list(void); 
int usbip_stub_export_device(struct usbip_exported_device *edev, int sockfd);



struct usbip_exported_device *usbip_stub_get_device(int num);

#endif
 


#endif /* __USBIP_STUB_DRIVER_H */

drivers/staging/usbip/userspace/libsrc/usbip.h

deleted100644 → 0
+0 −19
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2005-2007 Takahiro Hirofuchi

 */



#ifndef _USBIP_H

#define _USBIP_H



#ifdef HAVE_CONFIG_H

#include "../config.h"

#endif



#include "usbip_common.h"

#include "stub_driver.h"

#include "vhci_driver.h"

#ifdef DMALLOC

#include <dmalloc.h>

#endif



#endif