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

Commit 5a80fa04 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files

staging: comedi: usbdux: tidy up usbduxsub_submit_pwm_urbs() 



Pass the comedi_device pointer (the urb context) to this function
instead of the private data pointer.

Use a local variable for the urb pointer that is setup and submitted.

Remove the sanity check of the private data. This function can only
get called if the allocation was successful during the attach.

Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6754698b

drivers/staging/comedi/drivers/usbdux.c

+12 −17
Original line number Original line Diff line number Diff line
@@ -1546,25 +1546,20 @@ static void usbduxsub_pwm_irq(struct urb *urb) 
	}

	}

}

}





static int usbduxsub_submit_pwm_urbs(struct usbdux_private *usbduxsub)

static int usbduxsub_submit_pwm_urbs(struct comedi_device *dev)

{

{

	int err_flag;

	struct usbdux_private *devpriv = dev->private;



	struct urb *urb = devpriv->urb_pwm;

	if (!usbduxsub)

		return -EFAULT;





	/* in case of a resubmission after an unlink... */

	/* in case of a resubmission after an unlink... */

	usb_fill_bulk_urb(usbduxsub->urb_pwm,

	usb_fill_bulk_urb(urb, devpriv->usbdev,

			  usbduxsub->usbdev,

			  usb_sndbulkpipe(devpriv->usbdev, PWM_EP),

			  usb_sndbulkpipe(usbduxsub->usbdev, PWM_EP),

			  urb->transfer_buffer,

			  usbduxsub->urb_pwm->transfer_buffer,

			  devpriv->size_pwm_buf,

			  usbduxsub->size_pwm_buf, usbduxsub_pwm_irq,

			  usbduxsub_pwm_irq,

			  usbduxsub->comedidev);

			  dev);





	err_flag = usb_submit_urb(usbduxsub->urb_pwm, GFP_ATOMIC);

	return usb_submit_urb(urb, GFP_ATOMIC);

	if (err_flag)

		return err_flag;

	return 0;

}

}





static int usbdux_pwm_period(struct comedi_device *dev,

static int usbdux_pwm_period(struct comedi_device *dev,
@@ -1608,7 +1603,7 @@ static int usbdux_pwm_start(struct comedi_device *dev, 
		((char *)(this_usbduxsub->urb_pwm->transfer_buffer))[i] = 0;

		((char *)(this_usbduxsub->urb_pwm->transfer_buffer))[i] = 0;





	this_usbduxsub->pwm_cmd_running = 1;

	this_usbduxsub->pwm_cmd_running = 1;

	ret = usbduxsub_submit_pwm_urbs(this_usbduxsub);

	ret = usbduxsub_submit_pwm_urbs(dev);

	if (ret < 0) {

	if (ret < 0) {

		this_usbduxsub->pwm_cmd_running = 0;

		this_usbduxsub->pwm_cmd_running = 0;

		return ret;

		return ret;