RE: [PATCH] USB storage: Fix coding style

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



>   		scsi_unlock(host);
>
> -		/* reject the command if the direction indicator
> +		/* reject the command if the direction indicator
These two lines are same; you are just deleting it adding it again.
Does not make any sense here.


>   		 * is UNKNOWN
>   		 */
>   		if (us->srb->sc_data_direction == DMA_BIDIRECTIONAL) {
> @@ -306,7 +306,7 @@ static int usb_stor_control_thread(void * __us)
>   		/* reject if target != 0 or if LUN is higher than
>   		 * the maximum known LUN
>   		 */
> -		else if (us->srb->device->id &&
> +		else if (us->srb->device->id &&

These two lines are same

>   				!(us->fflags & US_FL_SCM_MULT_TARG)) {
>   			US_DEBUGP("Bad target number (%d:%d)\n",
>   				  us->srb->device->id,
us->srb->device->lun);
> @@ -319,7 +319,7 @@ static int usb_stor_control_thread(void * __us)
>   			us->srb->result = DID_BAD_TARGET << 16;
>   		}
>
> -		/* Handle those devices which need us to fake
> +		/* Handle those devices which need us to fake

These two lines are same

>   		 * their inquiry data */
>   		else if ((us->srb->cmnd[0] == INQUIRY) &&
>   			    (us->fflags & US_FL_FIX_INQUIRY)) {
> @@ -344,7 +344,7 @@ static int usb_stor_control_thread(void * __us)
>
>   		/* indicate that the command is done */
>   		if (us->srb->result != DID_ABORT << 16) {
> -			US_DEBUGP("scsi cmd done, result=0x%x\n",
> +			US_DEBUGP("scsi cmd done, result=0x%x\n",

These two lines are same

>   				   us->srb->result);
>   			us->srb->scsi_done(us->srb);
>   		} else {
> @@ -382,7 +382,7 @@ SkipForAbort:
>   	}
>   	__set_current_state(TASK_RUNNING);
>   	return 0;
> -}
> +}

These two lines are same

>
>
/***********************************************************************
>    * Device probing and disconnecting
> @@ -689,7 +689,7 @@ static int get_pipes(struct us_data *us)
>   	us->recv_ctrl_pipe = usb_rcvctrlpipe(us->pusb_dev, 0);
>   	us->send_bulk_pipe = usb_sndbulkpipe(us->pusb_dev,
>   		usb_endpoint_num(ep_out));
> -	us->recv_bulk_pipe = usb_rcvbulkpipe(us->pusb_dev,
> +	us->recv_bulk_pipe = usb_rcvbulkpipe(us->pusb_dev,

These two lines are same


>   		usb_endpoint_num(ep_in));
>   	if (ep_int) {
>   		us->recv_intr_pipe = usb_rcvintpipe(us->pusb_dev,
> @@ -763,7 +763,8 @@ static void dissociate_dev(struct us_data *us)
>
>   	/* Free the buffers */
>   	kfree(us->cr);
> -	usb_free_coherent(us->pusb_dev, US_IOBUF_SIZE, us->iobuf,
us->iobuf_dma);
> +	usb_free_coherent(us->pusb_dev, US_IOBUF_SIZE,
> +			us->iobuf, us->iobuf_dma);
>
>   	/* Remove our private data from the interface */
>   	usb_set_intfdata(us->pusb_intf, NULL);
> @@ -813,7 +814,7 @@ static void release_everything(struct us_data *us)
>   }
>
>   /* Thread to carry out delayed SCSI-device scanning */
> -static int usb_stor_scan_thread(void * __us)
> +static int usb_stor_scan_thread(void *__us)
>   {
>   	struct us_data *us = (struct us_data *)__us;
>   	struct device *dev = &us->pusb_intf->dev;
> @@ -854,9 +855,8 @@ static unsigned int usb_stor_sg_tablesize(struct
> usb_interface *intf)
>   {
>   	struct usb_device *usb_dev = interface_to_usbdev(intf);
>
> -	if (usb_dev->bus->sg_tablesize) {
> +	if (usb_dev->bus->sg_tablesize)
>   		return usb_dev->bus->sg_tablesize;
> -	}
>   	return SG_ALL;
>   }
>
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-usb" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux Media]     [Linux Input]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]     [Old Linux USB Devel Archive]

  Powered by Linux