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

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

staging: comedi: usbduxsigma: tidy up chanToInterval() 



Rename the function to have namespace associated with the driver.
Rename the CamelCase parameter 'nChannels' to avoid the checkpatch.pl
warning.

Tidy up the function a bit.

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 7333d50b

drivers/staging/comedi/drivers/usbduxsigma.c

+7 −10
Original line number Diff line number Diff line
@@ -502,16 +502,13 @@ static int usbduxsigma_submit_urbs(struct comedi_device *dev, 
	return 0;

}



static int chanToInterval(int nChannels)

static int usbduxsigma_chans_to_interval(int num_chan)

{

	if (nChannels <= 2)

		/* 4kHz */

		return 2;

	if (nChannels <= 8)

		/* 2kHz */

		return 4;

	/* 1kHz */

	return 8;

	if (num_chan <= 2)

		return 2;	/* 4kHz */

	if (num_chan <= 8)

		return 4;	/* 2kHz */

	return 8;		/* 1kHz */

}



static int usbduxsigma_ai_cmdtest(struct comedi_device *dev,
@@ -520,7 +517,7 @@ static int usbduxsigma_ai_cmdtest(struct comedi_device *dev, 
{

	struct usbduxsigma_private *devpriv = dev->private;

	int high_speed = devpriv->high_speed;

	int interval = chanToInterval(cmd->chanlist_len);

	int interval = usbduxsigma_chans_to_interval(cmd->chanlist_len);

	int err = 0;



	/* Step 1 : check if triggers are trivially valid */