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

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

staging: comedi: dt9812: pass the comedi_device * to dt9812_configure_gain() 



For aesthetic reasons, instead of passing the struct usb_dt9812 pointer,
pass the comedi_device pointer to this function.

Tidy up the function and use the comedi_device class_dev for the
dev_err() message.

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 c13626a2

drivers/staging/comedi/drivers/dt9812.c

+15 −10
Original line number Diff line number Diff line
@@ -462,18 +462,23 @@ static void dt9812_configure_mux(struct usb_dt9812 *dev, 
	}

}



static void dt9812_configure_gain(struct usb_dt9812 *dev,

static void dt9812_configure_gain(struct comedi_device *dev,

				  struct dt9812_rmw_byte *rmw,

				  enum dt9812_gain gain)

{

	if (dev->device == DT9812_DEVID_DT9812_10) {

	struct dt9812_private *devpriv = dev->private;

	struct slot_dt9812 *slot = devpriv->slot;

	struct usb_dt9812 *usb = slot->usb;



	/* In the DT9812/10V, there is an external gain of 0.5 */

	if (usb->device == DT9812_DEVID_DT9812_10)

		gain <<= 1;

	}



	rmw->address = F020_SFR_ADC0CF;

	rmw->and_mask = F020_MASK_ADC0CF_AMP0GN2 |

	    F020_MASK_ADC0CF_AMP0GN1 | F020_MASK_ADC0CF_AMP0GN0;

			F020_MASK_ADC0CF_AMP0GN1 |

			F020_MASK_ADC0CF_AMP0GN0;



	switch (gain) {

		/*

		 * 000 -> Gain =  1
@@ -504,8 +509,8 @@ static void dt9812_configure_gain(struct usb_dt9812 *dev, 
		rmw->or_value = F020_MASK_ADC0CF_AMP0GN2;

		break;

	default:

		dev_err(&dev->interface->dev, "Illegal gain %d\n", gain);



		dev_err(dev->class_dev, "Illegal gain %d\n", gain);

		break;

	}

}
@@ -528,7 +533,7 @@ static int dt9812_analog_in(struct comedi_device *dev, 
		goto exit;



	/* 1 select the gain */

	dt9812_configure_gain(slot->usb, &rmw[0], gain);

	dt9812_configure_gain(dev, &rmw[0], gain);



	/* 2 set the MUX to select the channel */

	dt9812_configure_mux(slot->usb, &rmw[1], channel);