Commit 35dd0c2d authored by matt mooney's avatar matt mooney Committed by Greg Kroah-Hartman
Browse files

staging: usbip: userspace: rename usbip device and interface 



Add prefix of usbip_ to internal usb device and interface to avoid
confusion with the kernel types. This also identifies the types as
being part of the usbip library.

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

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

+3 −2
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ static struct sysfs_driver *open_sysfs_stub_driver(void) 
#define SYSFS_OPEN_RETRIES 100



/* only the first interface value is true! */

static int32_t read_attr_usbip_status(struct usb_device *udev)

static int32_t read_attr_usbip_status(struct usbip_usb_device *udev)

{

	char attrpath[SYSFS_PATH_MAX];

	struct sysfs_attribute *attr;
@@ -145,7 +145,8 @@ static struct usbip_exported_device *usbip_exported_device_new(char *sdevpath) 
		goto err;



	/* reallocate buffer to include usb interface data */

	size_t size = sizeof(*edev) + edev->udev.bNumInterfaces * sizeof(struct usb_interface);

	size_t size = sizeof(*edev) + edev->udev.bNumInterfaces *

		sizeof(struct usbip_usb_interface);

	edev = (struct usbip_exported_device *) realloc(edev, size);

	if (!edev) {

		err("alloc device");

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

+2 −2
Original line number Diff line number Diff line
@@ -19,8 +19,8 @@ struct usbip_exported_device { 
	struct sysfs_device *sudev;



	int32_t status;

	struct usb_device    udev;

	struct usb_interface uinf[];

	struct usbip_usb_device    udev;

	struct usbip_usb_interface uinf[];

};

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

+5 −4
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ const char *usbip_speed_string(int num) 
#define DBG_UINF_INTEGER(name)\

	dbg("%-20s = %x", to_string(name), (int) uinf->name)



void dump_usb_interface(struct usb_interface *uinf)

void dump_usb_interface(struct usbip_usb_interface *uinf)

{

	char buff[100];

	usbip_names_get_class(buff, sizeof(buff),
@@ -74,7 +74,7 @@ void dump_usb_interface(struct usb_interface *uinf) 
	dbg("%-20s = %s", "Interface(C/SC/P)", buff);

}



void dump_usb_device(struct usb_device *udev)

void dump_usb_device(struct usbip_usb_device *udev)

{

	char buff[100];
@@ -181,7 +181,7 @@ int read_attr_speed(struct sysfs_device *dev) 
	do { (object)->name = (type) read_attr_value(dev, to_string(name), format); } while (0)





int read_usb_device(struct sysfs_device *sdev, struct usb_device *udev)

int read_usb_device(struct sysfs_device *sdev, struct usbip_usb_device *udev)

{

	uint32_t busnum, devnum;
@@ -209,7 +209,8 @@ int read_usb_device(struct sysfs_device *sdev, struct usb_device *udev) 
	return 0;

}



int read_usb_interface(struct usb_device *udev, int i, struct usb_interface *uinf)

int read_usb_interface(struct usbip_usb_device *udev, int i,

		       struct usbip_usb_interface *uinf)

{

	char busid[SYSFS_BUS_ID_SIZE];

	struct sysfs_device *sif;

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

+7 −6
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ extern int usbip_use_debug ; 
#define BUG()	do { err("sorry, it's a bug"); abort(); } while (0)





struct usb_interface {

struct usbip_usb_interface {

	uint8_t bInterfaceClass;

	uint8_t bInterfaceSubClass;

	uint8_t bInterfaceProtocol;
@@ -113,7 +113,7 @@ struct usb_interface { 






struct usb_device {

struct usbip_usb_device {

	char path[SYSFS_PATH_MAX];

	char busid[SYSFS_BUS_ID_SIZE];
@@ -135,11 +135,12 @@ struct usb_device { 


#define to_string(s)	#s



void dump_usb_interface(struct usb_interface *);

void dump_usb_device(struct usb_device *);

int read_usb_device(struct sysfs_device *sdev, struct usb_device *udev);

void dump_usb_interface(struct usbip_usb_interface *);

void dump_usb_device(struct usbip_usb_device *);

int read_usb_device(struct sysfs_device *sdev, struct usbip_usb_device *udev);

int read_attr_value(struct sysfs_device *dev, const char *name, const char *format);

int read_usb_interface(struct usb_device *udev, int i, struct usb_interface *uinf);

int read_usb_interface(struct usbip_usb_device *udev, int i,

		       struct usbip_usb_interface *uinf);



const char *usbip_speed_string(int num);

const char *usbip_status_string(int32_t status);

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

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ struct usbip_imported_device { 


	/* usbip_class_device list */

	struct dlist *cdev_list;

	struct usb_device udev;

	struct usbip_usb_device udev;

};



struct usbip_vhci_driver {