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

Commit c0704541 authored by Luiz Fernando N. Capitulino's avatar Luiz Fernando N. Capitulino Committed by Greg Kroah-Hartman
Browse files

usb-skeleton: small update 



o CodingStyle fixes
o Removes trailing spaces
o Do not make not needed initialiation of automatic variables
o Use usb_endpoint_* functions
o If we get an error in the write URB callback print an error message instead
  of a debug one

(Pretty unrelated changes, but spliting this up doesn't pay off as our main
changes are just CodingStyle fixes).

Signed-off-by: default avatarLuiz Fernando N. Capitulino <lcapitulino@mandriva.com.br>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent d5cbad4b

drivers/usb/usb-skeleton.c

+22 −28
Original line number Diff line number Diff line 
/*

 * USB Skeleton driver - 2.1

 * USB Skeleton driver - 2.2

 *

 * Copyright (C) 2001-2004 Greg Kroah-Hartman (greg@kroah.com)

 *
@@ -44,7 +44,7 @@ MODULE_DEVICE_TABLE (usb, skel_table); 


/* Structure to hold all of our device specific stuff */

struct usb_skel {

	struct usb_device *	udev;			/* the usb device for this device */

	struct usb_device       *dev;			/* the usb device for this device */

	struct usb_interface    *interface;		/* the interface for this device */

	struct semaphore	limit_sem;		/* limiting the number of writes in progress */

	unsigned char           *bulk_in_buffer;	/* the buffer to receive data */
@@ -116,7 +116,7 @@ static int skel_release(struct inode *inode, struct file *file) 
static ssize_t skel_read(struct file *file, char *buffer, size_t count, loff_t *ppos)

{

	struct usb_skel *dev;

	int retval = 0;

	int retval;

	int bytes_read;



	dev = (struct usb_skel *)file->private_data;
@@ -158,7 +158,7 @@ static void skel_write_bulk_callback(struct urb *urb, struct pt_regs *regs) 
	    !(urb->status == -ENOENT ||

	      urb->status == -ECONNRESET ||

	      urb->status == -ESHUTDOWN)) {

		dbg("%s - nonzero write bulk status received: %d",

		err("%s - nonzero write bulk status received: %d",

		    __FUNCTION__, urb->status);

	}
@@ -263,7 +263,7 @@ static struct usb_class_driver skel_class = { 


static int skel_probe(struct usb_interface *interface, const struct usb_device_id *id)

{

	struct usb_skel *dev = NULL;

	struct usb_skel *dev;

	struct usb_host_interface *iface_desc;

	struct usb_endpoint_descriptor *endpoint;

	size_t buffer_size;
@@ -272,7 +272,7 @@ static int skel_probe(struct usb_interface *interface, const struct usb_device_i 


	/* allocate memory for our device state and initialize it */

	dev = kzalloc(sizeof(*dev), GFP_KERNEL);

	if (dev == NULL) {

	if (!dev) {

		err("Out of memory");

		goto error;

	}
@@ -290,10 +290,7 @@ static int skel_probe(struct usb_interface *interface, const struct usb_device_i 
		endpoint = &iface_desc->endpoint[i].desc;



		if (!dev->bulk_in_endpointAddr &&

		    ((endpoint->bEndpointAddress & USB_ENDPOINT_DIR_MASK)

					== USB_DIR_IN) &&

		    ((endpoint->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK)

					== USB_ENDPOINT_XFER_BULK)) {

		    usb_endpoint_is_bulk_in(endpoint)) {

			/* we found a bulk in endpoint */

			buffer_size = le16_to_cpu(endpoint->wMaxPacketSize);

			dev->bulk_in_size = buffer_size;
@@ -306,10 +303,7 @@ static int skel_probe(struct usb_interface *interface, const struct usb_device_i 
		}



		if (!dev->bulk_out_endpointAddr &&

		    ((endpoint->bEndpointAddress & USB_ENDPOINT_DIR_MASK)

					== USB_DIR_OUT) &&

		    ((endpoint->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK)

					== USB_ENDPOINT_XFER_BULK)) {

		    usb_endpoint_is_bulk_out(endpoint)) {

			/* we found a bulk out endpoint */

			dev->bulk_out_endpointAddr = endpoint->bEndpointAddress;

		}