Commit d9ad7a98 authored by Malcolm Priestley's avatar Malcolm Priestley Committed by Greg Kroah-Hartman
Browse files

staging: vt6656: clean up s_nsInterruptUsbIoCompleteRead 



Remove comments, white space and camel case

Camel Case changes
pDevice -> priv
ntStatus -> status

Signed-off-by: default avatarMalcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 749627f2

drivers/staging/vt6656/usbpipe.c

+24 −45
Original line number Diff line number Diff line
@@ -348,22 +348,12 @@ usb_fill_bulk_urb(pDevice->pInterruptURB, 


static void s_nsInterruptUsbIoCompleteRead(struct urb *urb)

{

	struct vnt_private *pDevice = (struct vnt_private *)urb->context;

	int ntStatus;

	struct vnt_private *priv = (struct vnt_private *)urb->context;

	int status;



    DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"---->s_nsInterruptUsbIoCompleteRead\n");

    //

    // The context given to IoSetCompletionRoutine is the receive buffer object

    //

	DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO

			"---->s_nsInterruptUsbIoCompleteRead\n");



    //

    // We have a number of cases:

    //      1) The USB read timed out and we received no data.

    //      2) The USB read timed out and we received some data.

    //      3) The USB read was successful and fully filled our irp buffer.

    //      4) The irp was cancelled.

    //      5) Some other failure from the USB device object.

    //

	switch (urb->status) {

	case 0:

	case -ETIMEDOUT:
@@ -371,49 +361,38 @@ static void s_nsInterruptUsbIoCompleteRead(struct urb *urb) 
	case -ECONNRESET:

	case -ENOENT:

	case -ESHUTDOWN:

		pDevice->intBuf.bInUse = false;

		priv->intBuf.bInUse = false;

		return;

	default:

		break;

	}



    ntStatus = urb->status;



    DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"s_nsInterruptUsbIoCompleteRead Status %d\n", ntStatus);

	status = urb->status;



    // if we were not successful, we need to free the int buffer for future use right here

    // otherwise interrupt data handler will free int buffer after it handle it.

    if (( ntStatus != STATUS_SUCCESS )) {

        pDevice->ulBulkInError++;

        pDevice->intBuf.bInUse = false;

	DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO

		"s_nsInterruptUsbIoCompleteRead Status %d\n", status);



//        if (ntStatus == USBD_STATUS_CRC) {

//            pDevice->ulIntInContCRCError++;

//        }

	if (status != STATUS_SUCCESS) {

		priv->ulBulkInError++;

		priv->intBuf.bInUse = false;



//        if (ntStatus == STATUS_NOT_CONNECTED )

//        {

//        }

        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"IntUSBIoCompleteControl STATUS = %d\n", ntStatus );

		DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO

			"IntUSBIoCompleteControl STATUS = %d\n", status);

	} else {

	    pDevice->ulIntInBytesRead += (unsigned long) urb->actual_length;

	    pDevice->ulIntInContCRCError = 0;

	    pDevice->bEventAvailable = true;

	    INTnsProcessData(pDevice);

		priv->ulIntInBytesRead += (unsigned long)urb->actual_length;

		priv->ulIntInContCRCError = 0;

		priv->bEventAvailable = true;

		INTnsProcessData(priv);

	}



	ntStatus = usb_submit_urb(pDevice->pInterruptURB, GFP_ATOMIC);

	if (ntStatus) {

	status = usb_submit_urb(priv->pInterruptURB, GFP_ATOMIC);

	if (status) {

		DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO

			"Submit int URB failed %d\n", ntStatus);

			"Submit int URB failed %d\n", status);

	} else {

		pDevice->intBuf.bInUse = true;

		priv->intBuf.bInUse = true;

	}



    //

    // We return STATUS_MORE_PROCESSING_REQUIRED so that the completion

    // routine (IofCompleteRequest) will stop working on the irp.

    //

	return;

}