Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9db91e1b authored by Kurt Kanzenbach's avatar Kurt Kanzenbach Committed by Greg Kroah-Hartman
Browse files

staging: usbip: userspace: libsrc: replaced lines over 80 characters 



This patch fixes some of the following checkpatch warnings:
-WARNING: line over 80 characters

We did not split format strings for readability.

Signed-off-by: default avatarKurt Kanzenbach <ly80toro@cip.cs.fau.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 71bd5b76

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

+144 −71
Original line number Diff line number Diff line
@@ -122,7 +122,8 @@ static struct genericstrtable *countrycodes[HASHSZ] = { NULL, }; 


/* ---------------------------------------------------------------------- */



static const char *names_genericstrtable(struct genericstrtable *t[HASHSZ], unsigned int index)

static const char *names_genericstrtable(struct genericstrtable *t[HASHSZ],

					 unsigned int index)

{

	struct genericstrtable *h;
@@ -216,13 +217,16 @@ const char *names_subclass(u_int8_t classid, u_int8_t subclassid) 
	return NULL;

}



const char *names_protocol(u_int8_t classid, u_int8_t subclassid, u_int8_t protocolid)

const char *names_protocol(u_int8_t classid, u_int8_t subclassid,

			   u_int8_t protocolid)

{

	struct protocol *p;



	p = protocols[hashnum((classid << 16) | (subclassid << 8) | protocolid)];

	p = protocols[hashnum((classid << 16) | (subclassid << 8)

			      | protocolid)];

	for (; p; p = p->next)

		if (p->classid == classid && p->subclassid == subclassid && p->protocolid == protocolid)

		if (p->classid == classid && p->subclassid == subclassid &&

		    p->protocolid == protocolid)

			return p->name;

	return NULL;

}
@@ -308,7 +312,8 @@ static int new_vendor(const char *name, u_int16_t vendorid) 
	return 0;

}



static int new_product(const char *name, u_int16_t vendorid, u_int16_t productid)

static int new_product(const char *name, u_int16_t vendorid,

		       u_int16_t productid)

{

	struct product *p;

	unsigned int h = hashnum((vendorid << 16) | productid);
@@ -367,14 +372,17 @@ static int new_subclass(const char *name, u_int8_t classid, u_int8_t subclassid) 
	return 0;

}



static int new_protocol(const char *name, u_int8_t classid, u_int8_t subclassid, u_int8_t protocolid)

static int new_protocol(const char *name, u_int8_t classid, u_int8_t subclassid,

			u_int8_t protocolid)

{

	struct protocol *p;

	unsigned int h = hashnum((classid << 16) | (subclassid << 8) | protocolid);

	unsigned int h = hashnum((classid << 16) | (subclassid << 8)

				 | protocolid);



	p = protocols[h];

	for (; p; p = p->next)

		if (p->classid == classid && p->subclassid == subclassid && p->protocolid == protocolid)

		if (p->classid == classid && p->subclassid == subclassid

		    && p->protocolid == protocolid)

			return -1;

	p = my_malloc(sizeof(struct protocol) + strlen(name));

	if (!p)
@@ -407,7 +415,8 @@ static int new_audioterminal(const char *name, u_int16_t termt) 
	return 0;

}



static int new_genericstrtable(struct genericstrtable *t[HASHSZ], const char *name, unsigned int index)

static int new_genericstrtable(struct genericstrtable *t[HASHSZ],

			       const char *name, unsigned int index)

{

	struct genericstrtable *g;

	unsigned int h = hashnum(index);
@@ -472,7 +481,11 @@ static void parse(FILE *f) 
{

	char buf[512], *cp;

	unsigned int linectr = 0;

	int lastvendor = -1, lastclass = -1, lastsubclass = -1, lasthut = -1, lastlang = -1;

	int lastvendor = -1;

	int lastclass = -1;

	int lastsubclass = -1;

	int lasthut = -1;

	int lastlang = -1;

	unsigned int u;



	while (fgets(buf, sizeof(buf), f)) {
@@ -485,67 +498,82 @@ static void parse(FILE *f) 
		if (buf[0] == '#' || !buf[0])

			continue;

		cp = buf;

		if (buf[0] == 'P' && buf[1] == 'H' && buf[2] == 'Y' && buf[3] == 'S' && buf[4] == 'D' &&

			buf[5] == 'E' && buf[6] == 'S' && /*isspace(buf[7])*/ buf[7] == ' ') {

		if (buf[0] == 'P' && buf[1] == 'H' && buf[2] == 'Y'

		    && buf[3] == 'S' && buf[4] == 'D' && buf[5] == 'E'

		    && buf[6] == 'S' && /*isspace(buf[7])*/ buf[7] == ' ') {

			cp = buf + 8;

			while (isspace(*cp))

				cp++;

			if (!isxdigit(*cp)) {

				fprintf(stderr, "Invalid Physdes type at line %u\n", linectr);

				fprintf(stderr, "Invalid Physdes type at line %u\n",

					linectr);

				continue;

			}

			u = strtoul(cp, &cp, 16);

			while (isspace(*cp))

				cp++;

			if (!*cp) {

				fprintf(stderr, "Invalid Physdes type at line %u\n", linectr);

				fprintf(stderr, "Invalid Physdes type at line %u\n",

					linectr);

				continue;

			}

			if (new_physdes(cp, u))

				fprintf(stderr, "Duplicate Physdes  type spec at line %u terminal type %04x %s\n", linectr, u, cp);

			DBG(printf("line %5u physdes type %02x %s\n", linectr, u, cp));

				fprintf(stderr, "Duplicate Physdes  type spec at line %u terminal type %04x %s\n",

					linectr, u, cp);

			DBG(printf("line %5u physdes type %02x %s\n", linectr,

				   u, cp));

			continue;



		}

		if (buf[0] == 'P' && buf[1] == 'H' && buf[2] == 'Y' && /*isspace(buf[3])*/ buf[3] == ' ') {

		if (buf[0] == 'P' && buf[1] == 'H' && buf[2] == 'Y'

		    && /*isspace(buf[3])*/ buf[3] == ' ') {

			cp = buf + 4;

			while (isspace(*cp))

				cp++;

			if (!isxdigit(*cp)) {

				fprintf(stderr, "Invalid PHY type at line %u\n", linectr);

				fprintf(stderr, "Invalid PHY type at line %u\n",

					linectr);

				continue;

			}

			u = strtoul(cp, &cp, 16);

			while (isspace(*cp))

				cp++;

			if (!*cp) {

				fprintf(stderr, "Invalid PHY type at line %u\n", linectr);

				fprintf(stderr, "Invalid PHY type at line %u\n",

					linectr);

				continue;

			}

			if (new_physdes(cp, u))

				fprintf(stderr, "Duplicate PHY type spec at line %u terminal type %04x %s\n", linectr, u, cp);

			DBG(printf("line %5u PHY type %02x %s\n", linectr, u, cp));

				fprintf(stderr, "Duplicate PHY type spec at line %u terminal type %04x %s\n",

					linectr, u, cp);

			DBG(printf("line %5u PHY type %02x %s\n", linectr, u,

				   cp));

			continue;



		}

		if (buf[0] == 'B' && buf[1] == 'I' && buf[2] == 'A' && buf[3] == 'S' && /*isspace(buf[4])*/ buf[4] == ' ') {

		if (buf[0] == 'B' && buf[1] == 'I' && buf[2] == 'A'

		    && buf[3] == 'S' && /*isspace(buf[4])*/ buf[4] == ' ') {

			cp = buf + 5;

			while (isspace(*cp))

				cp++;

			if (!isxdigit(*cp)) {

				fprintf(stderr, "Invalid BIAS type at line %u\n", linectr);

				fprintf(stderr, "Invalid BIAS type at line %u\n",

					linectr);

				continue;

			}

			u = strtoul(cp, &cp, 16);

			while (isspace(*cp))

				cp++;

			if (!*cp) {

				fprintf(stderr, "Invalid BIAS type at line %u\n", linectr);

				fprintf(stderr, "Invalid BIAS type at line %u\n",

					linectr);

				continue;

			}

			if (new_bias(cp, u))

				fprintf(stderr, "Duplicate BIAS  type spec at line %u terminal type %04x %s\n", linectr, u, cp);

			DBG(printf("line %5u BIAS type %02x %s\n", linectr, u, cp));

				fprintf(stderr, "Duplicate BIAS  type spec at line %u terminal type %04x %s\n",

					linectr, u, cp);

			DBG(printf("line %5u BIAS type %02x %s\n", linectr, u,

				   cp));

			continue;



		}
@@ -554,19 +582,23 @@ static void parse(FILE *f) 
			while (isspace(*cp))

				cp++;

			if (!isxdigit(*cp)) {

				fprintf(stderr, "Invalid LANGID spec at line %u\n", linectr);

				fprintf(stderr, "Invalid LANGID spec at line %u\n",

					linectr);

				continue;

			}

			u = strtoul(cp, &cp, 16);

			while (isspace(*cp))

				cp++;

			if (!*cp) {

				fprintf(stderr, "Invalid LANGID spec at line %u\n", linectr);

				fprintf(stderr, "Invalid LANGID spec at line %u\n",

					linectr);

				continue;

			}

			if (new_langid(cp, u))

				fprintf(stderr, "Duplicate LANGID spec at line %u language-id %04x %s\n", linectr, u, cp);

			DBG(printf("line %5u LANGID %02x %s\n", linectr, u, cp));

				fprintf(stderr, "Duplicate LANGID spec at line %u language-id %04x %s\n",

					linectr, u, cp);

			DBG(printf("line %5u LANGID %02x %s\n", linectr, u,

				   cp));

			lasthut = lastclass = lastvendor = lastsubclass = -1;

			lastlang = u;

			continue;
@@ -577,18 +609,21 @@ static void parse(FILE *f) 
			while (isspace(*cp))

				cp++;

			if (!isxdigit(*cp)) {

				fprintf(stderr, "Invalid class spec at line %u\n", linectr);

				fprintf(stderr, "Invalid class spec at line %u\n",

					linectr);

				continue;

			}

			u = strtoul(cp, &cp, 16);

			while (isspace(*cp))

				cp++;

			if (!*cp) {

				fprintf(stderr, "Invalid class spec at line %u\n", linectr);

				fprintf(stderr, "Invalid class spec at line %u\n",

					linectr);

				continue;

			}

			if (new_class(cp, u))

				fprintf(stderr, "Duplicate class spec at line %u class %04x %s\n", linectr, u, cp);

				fprintf(stderr, "Duplicate class spec at line %u class %04x %s\n",

					linectr, u, cp);

			DBG(printf("line %5u class %02x %s\n", linectr, u, cp));

			lasthut = lastlang = lastvendor = lastsubclass = -1;

			lastclass = u;
@@ -600,40 +635,49 @@ static void parse(FILE *f) 
			while (isspace(*cp))

				cp++;

			if (!isxdigit(*cp)) {

				fprintf(stderr, "Invalid audio terminal type at line %u\n", linectr);

				fprintf(stderr, "Invalid audio terminal type at line %u\n",

					linectr);

				continue;

			}

			u = strtoul(cp, &cp, 16);

			while (isspace(*cp))

				cp++;

			if (!*cp) {

				fprintf(stderr, "Invalid audio terminal type at line %u\n", linectr);

				fprintf(stderr, "Invalid audio terminal type at line %u\n",

					linectr);

				continue;

			}

			if (new_audioterminal(cp, u))

				fprintf(stderr, "Duplicate audio terminal type spec at line %u terminal type %04x %s\n", linectr, u, cp);

			DBG(printf("line %5u audio terminal type %02x %s\n", linectr, u, cp));

				fprintf(stderr, "Duplicate audio terminal type spec at line %u terminal type %04x %s\n",

					linectr, u, cp);

			DBG(printf("line %5u audio terminal type %02x %s\n",

				   linectr, u, cp));

			continue;

		}

		if (buf[0] == 'H' && buf[1] == 'C' && buf[2] == 'C' && isspace(buf[3])) {

		if (buf[0] == 'H' && buf[1] == 'C' && buf[2] == 'C'

		    && isspace(buf[3])) {

			/* HID Descriptor bCountryCode */

			cp =  buf+3;

			while (isspace(*cp))

				cp++;

			if (!isxdigit(*cp)) {

				fprintf(stderr, "Invalid HID country code at line %u\n", linectr);

				fprintf(stderr, "Invalid HID country code at line %u\n",

					linectr);

				continue;

			}

			u = strtoul(cp, &cp, 10);

			while (isspace(*cp))

				cp++;

			if (!*cp) {

				fprintf(stderr, "Invalid HID country code at line %u\n", linectr);

				fprintf(stderr, "Invalid HID country code at line %u\n",

					linectr);

				continue;

			}

			if (new_countrycode(cp, u))

				fprintf(stderr, "Duplicate HID country code at line %u country %02u %s\n", linectr, u, cp);

			DBG(printf("line %5u keyboard country code %02u %s\n", linectr, u, cp));

				fprintf(stderr, "Duplicate HID country code at line %u country %02u %s\n",

					linectr, u, cp);

			DBG(printf("line %5u keyboard country code %02u %s\n",

				   linectr, u, cp));

			continue;

		}

		if (isxdigit(*cp)) {
@@ -642,12 +686,15 @@ static void parse(FILE *f) 
			while (isspace(*cp))

				cp++;

			if (!*cp) {

				fprintf(stderr, "Invalid vendor spec at line %u\n", linectr);

				fprintf(stderr, "Invalid vendor spec at line %u\n",

					linectr);

				continue;

			}

			if (new_vendor(cp, u))

				fprintf(stderr, "Duplicate vendor spec at line %u vendor %04x %s\n", linectr, u, cp);

			DBG(printf("line %5u vendor %04x %s\n", linectr, u, cp));

				fprintf(stderr, "Duplicate vendor spec at line %u vendor %04x %s\n",

					linectr, u, cp);

			DBG(printf("line %5u vendor %04x %s\n", linectr, u,

				   cp));

			lastvendor = u;

			lasthut = lastlang = lastclass = lastsubclass = -1;

			continue;
@@ -658,33 +705,41 @@ static void parse(FILE *f) 
			while (isspace(*cp))

				cp++;

			if (!*cp) {

				fprintf(stderr, "Invalid product/subclass spec at line %u\n", linectr);

				fprintf(stderr, "Invalid product/subclass spec at line %u\n",

					linectr);

				continue;

			}

			if (lastvendor != -1) {

				if (new_product(cp, lastvendor, u))

					fprintf(stderr, "Duplicate product spec at line %u product %04x:%04x %s\n", linectr, lastvendor, u, cp);

				DBG(printf("line %5u product %04x:%04x %s\n", linectr, lastvendor, u, cp));

					fprintf(stderr, "Duplicate product spec at line %u product %04x:%04x %s\n",

						linectr, lastvendor, u, cp);

				DBG(printf("line %5u product %04x:%04x %s\n",

					   linectr, lastvendor, u, cp));

				continue;

			}

			if (lastclass != -1) {

				if (new_subclass(cp, lastclass, u))

					fprintf(stderr, "Duplicate subclass spec at line %u class %02x:%02x %s\n", linectr, lastclass, u, cp);

				DBG(printf("line %5u subclass %02x:%02x %s\n", linectr, lastclass, u, cp));

					fprintf(stderr, "Duplicate subclass spec at line %u class %02x:%02x %s\n",

						linectr, lastclass, u, cp);

				DBG(printf("line %5u subclass %02x:%02x %s\n",

					   linectr, lastclass, u, cp));

				lastsubclass = u;

				continue;

			}

			if (lasthut != -1) {

				if (new_hutus(cp, (lasthut << 16)+u))

					fprintf(stderr, "Duplicate HUT Usage Spec at line %u\n", linectr);

					fprintf(stderr, "Duplicate HUT Usage Spec at line %u\n",

						linectr);

				continue;

			}

			if (lastlang != -1) {

				if (new_langid(cp, lastlang+(u<<10)))

					fprintf(stderr, "Duplicate LANGID Usage Spec at line %u\n", linectr);

					fprintf(stderr, "Duplicate LANGID Usage Spec at line %u\n",

						linectr);

				continue;

			}

			fprintf(stderr, "Product/Subclass spec without prior Vendor/Class spec at line %u\n", linectr);

			fprintf(stderr, "Product/Subclass spec without prior Vendor/Class spec at line %u\n",

				linectr);

			continue;

		}

		if (buf[0] == '\t' && buf[1] == '\t' && isxdigit(buf[2])) {
@@ -693,59 +748,73 @@ static void parse(FILE *f) 
			while (isspace(*cp))

				cp++;

			if (!*cp) {

				fprintf(stderr, "Invalid protocol spec at line %u\n", linectr);

				fprintf(stderr, "Invalid protocol spec at line %u\n",

					linectr);

				continue;

			}

			if (lastclass != -1 && lastsubclass != -1) {

				if (new_protocol(cp, lastclass, lastsubclass, u))

					fprintf(stderr, "Duplicate protocol spec at line %u class %02x:%02x:%02x %s\n", linectr, lastclass, lastsubclass, u, cp);

				DBG(printf("line %5u protocol %02x:%02x:%02x %s\n", linectr, lastclass, lastsubclass, u, cp));

					fprintf(stderr, "Duplicate protocol spec at line %u class %02x:%02x:%02x %s\n",

						linectr, lastclass, lastsubclass, u, cp);

				DBG(printf("line %5u protocol %02x:%02x:%02x %s\n",

					   linectr, lastclass, lastsubclass, u, cp));

				continue;

			}

			fprintf(stderr, "Protocol spec without prior Class and Subclass spec at line %u\n", linectr);

			fprintf(stderr, "Protocol spec without prior Class and Subclass spec at line %u\n",

				linectr);

			continue;

		}

		if (buf[0] == 'H' && buf[1] == 'I' && buf[2] == 'D' && /*isspace(buf[3])*/ buf[3] == ' ') {

		if (buf[0] == 'H' && buf[1] == 'I' && buf[2] == 'D'

		    && /*isspace(buf[3])*/ buf[3] == ' ') {

			cp = buf + 4;

			while (isspace(*cp))

				cp++;

			if (!isxdigit(*cp)) {

				fprintf(stderr, "Invalid HID type at line %u\n", linectr);

				fprintf(stderr, "Invalid HID type at line %u\n",

					linectr);

				continue;

			}

			u = strtoul(cp, &cp, 16);

			while (isspace(*cp))

				cp++;

			if (!*cp) {

				fprintf(stderr, "Invalid HID type at line %u\n", linectr);

				fprintf(stderr, "Invalid HID type at line %u\n",

					linectr);

				continue;

			}

			if (new_hid(cp, u))

				fprintf(stderr, "Duplicate HID type spec at line %u terminal type %04x %s\n", linectr, u, cp);

			DBG(printf("line %5u HID type %02x %s\n", linectr, u, cp));

				fprintf(stderr, "Duplicate HID type spec at line %u terminal type %04x %s\n",

					linectr, u, cp);

			DBG(printf("line %5u HID type %02x %s\n", linectr, u,

				   cp));

			continue;



		}

		if (buf[0] == 'H' && buf[1] == 'U' && buf[2] == 'T' && /*isspace(buf[3])*/ buf[3] == ' ') {

		if (buf[0] == 'H' && buf[1] == 'U' && buf[2] == 'T'

		    && /*isspace(buf[3])*/ buf[3] == ' ') {

			cp = buf + 4;

			while (isspace(*cp))

				cp++;

			if (!isxdigit(*cp)) {

				fprintf(stderr, "Invalid HUT type at line %u\n", linectr);

				fprintf(stderr, "Invalid HUT type at line %u\n",

					linectr);

				continue;

			}

			u = strtoul(cp, &cp, 16);

			while (isspace(*cp))

				cp++;

			if (!*cp) {

				fprintf(stderr, "Invalid HUT type at line %u\n", linectr);

				fprintf(stderr, "Invalid HUT type at line %u\n",

					linectr);

				continue;

			}

			if (new_huts(cp, u))

				fprintf(stderr, "Duplicate HUT type spec at line %u terminal type %04x %s\n", linectr, u, cp);

				fprintf(stderr, "Duplicate HUT type spec at line %u terminal type %04x %s\n",

					linectr, u, cp);

			lastlang = lastclass = lastvendor = lastsubclass = -1;

			lasthut = u;

			DBG(printf("line %5u HUT type %02x %s\n", linectr, u, cp));

			DBG(printf("line %5u HUT type %02x %s\n", linectr, u,

				   cp));

			continue;



		}
@@ -754,19 +823,23 @@ static void parse(FILE *f) 
			while (isspace(*cp))

				cp++;

			if (!isxdigit(*cp)) {

				fprintf(stderr, "Invalid Report type at line %u\n", linectr);

				fprintf(stderr, "Invalid Report type at line %u\n",

					linectr);

				continue;

			}

			u = strtoul(cp, &cp, 16);

			while (isspace(*cp))

				cp++;

			if (!*cp) {

				fprintf(stderr, "Invalid Report type at line %u\n", linectr);

				fprintf(stderr, "Invalid Report type at line %u\n",

					linectr);

				continue;

			}

			if (new_reporttag(cp, u))

				fprintf(stderr, "Duplicate Report type spec at line %u terminal type %04x %s\n", linectr, u, cp);

			DBG(printf("line %5u Report type %02x %s\n", linectr, u, cp));

				fprintf(stderr, "Duplicate Report type spec at line %u terminal type %04x %s\n",

					linectr, u, cp);

			DBG(printf("line %5u Report type %02x %s\n", linectr,

				   u, cp));

			continue;



		}

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

+2 −1
Original line number Diff line number Diff line
@@ -40,7 +40,8 @@ extern const char *names_vendor(u_int16_t vendorid); 
extern const char *names_product(u_int16_t vendorid, u_int16_t productid);

extern const char *names_class(u_int8_t classid);

extern const char *names_subclass(u_int8_t classid, u_int8_t subclassid);

extern const char *names_protocol(u_int8_t classid, u_int8_t subclassid, u_int8_t protocolid);

extern const char *names_protocol(u_int8_t classid, u_int8_t subclassid,

				  u_int8_t protocolid);

extern const char *names_audioterminal(u_int16_t termt);

extern const char *names_hid(u_int8_t hidd);

extern const char *names_reporttag(u_int8_t rt);

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

+11 −5
Original line number Diff line number Diff line
@@ -109,7 +109,8 @@ void dump_usb_device(struct usbip_usb_device *udev) 
}





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

int read_attr_value(struct sysfs_device *dev, const char *name,

		    const char *format)

{

	char attrpath[SYSFS_PATH_MAX];

	struct sysfs_attribute *attr;
@@ -181,7 +182,10 @@ int read_attr_speed(struct sysfs_device *dev) 
}



#define READ_ATTR(object, type, dev, name, format)			      \

	do { (object)->name = (type) read_attr_value(dev, to_string(name), format); } while (0)

	do {								      \

		(object)->name = (type) read_attr_value(dev, to_string(name), \

							format);	      \

	} while (0)





int read_usb_device(struct sysfs_device *sdev, struct usbip_usb_device *udev)
@@ -245,7 +249,8 @@ void usbip_names_free() 
	names_free();

}



void usbip_names_get_product(char *buff, size_t size, uint16_t vendor, uint16_t product)

void usbip_names_get_product(char *buff, size_t size, uint16_t vendor,

			     uint16_t product)

{

	const char *prod, *vend;
@@ -261,7 +266,8 @@ void usbip_names_get_product(char *buff, size_t size, uint16_t vendor, uint16_t 
	snprintf(buff, size, "%s : %s (%04x:%04x)", vend, prod, vendor, product);

}



void usbip_names_get_class(char *buff, size_t size, uint8_t class, uint8_t subclass, uint8_t protocol)

void usbip_names_get_class(char *buff, size_t size, uint8_t class,

			   uint8_t subclass, uint8_t protocol)

{

	const char *c, *s, *p;

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

+6 −3
Original line number Diff line number Diff line
@@ -132,7 +132,8 @@ struct usbip_usb_device { 
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_attr_value(struct sysfs_device *dev, const char *name,

		    const char *format);

int read_usb_interface(struct usbip_usb_device *udev, int i,

		       struct usbip_usb_interface *uinf);
@@ -141,7 +142,9 @@ const char *usbip_status_string(int32_t status); 


int usbip_names_init(char *);

void usbip_names_free(void);

void usbip_names_get_product(char *buff, size_t size, uint16_t vendor, uint16_t product);

void usbip_names_get_class(char *buff, size_t size, uint8_t class, uint8_t subclass, uint8_t protocol);

void usbip_names_get_product(char *buff, size_t size, uint16_t vendor,

			     uint16_t product);

void usbip_names_get_class(char *buff, size_t size, uint8_t class,

			   uint8_t subclass, uint8_t protocol);



#endif /* __USBIP_COMMON_H */

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

+12 −6
Original line number Diff line number Diff line
@@ -10,7 +10,8 @@ 


struct usbip_vhci_driver *vhci_driver;



static struct usbip_imported_device *imported_device_init(struct usbip_imported_device *idev, char *busid)

static struct usbip_imported_device *

imported_device_init(struct usbip_imported_device *idev, char *busid)

{

	struct sysfs_device *sudev;
@@ -29,8 +30,10 @@ static struct usbip_imported_device *imported_device_init(struct usbip_imported_ 
		if (!strncmp(cdev->dev_path, idev->udev.path,

			     strlen(idev->udev.path))) {

			struct usbip_class_device *new_cdev;



			/* alloc and copy because dlist is linked from only one list */

			/*

			 * alloc and copy because dlist is linked

			 * from only one list

			 */

			new_cdev = calloc(1, sizeof(*new_cdev));

			if (!new_cdev)

				goto err;
@@ -101,7 +104,8 @@ static int parse_status(char *value) 
				return -1;

			}



			if (idev->status != VDEV_ST_NULL && idev->status != VDEV_ST_NOTASSIGNED) {

			if (idev->status != VDEV_ST_NULL

			    && idev->status != VDEV_ST_NOTASSIGNED) {

				idev = imported_device_init(idev, lbusid);

				if (!idev) {

					dbg("imported_device_init failed");
@@ -126,8 +130,10 @@ static int parse_status(char *value) 


static int check_usbip_device(struct sysfs_class_device *cdev)

{

	char class_path[SYSFS_PATH_MAX]; /* /sys/class/video4linux/video0/device */

	char dev_path[SYSFS_PATH_MAX];	 /* /sys/devices/platform/vhci_hcd/usb6/6-1:1.1 */

	/* /sys/class/video4linux/video0/device */

	char class_path[SYSFS_PATH_MAX];

	/* /sys/devices/platform/vhci_hcd/usb6/6-1:1.1 */

	char dev_path[SYSFS_PATH_MAX];

	int ret;

	struct usbip_class_device *usbip_cdev;