From: H Hartley Sweeten Date: Tue, 14 May 2013 21:26:05 +0000 (-0700) Subject: staging: comedi: dt9812: pass the comedi_device * to dt9812_configure_mux() X-Git-Tag: firefly_0821_release~176^2~5845^2~625 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=687d84798de4c202c104db888b33e956bb5b883d;p=firefly-linux-kernel-4.4.55.git staging: comedi: dt9812: pass the comedi_device * to dt9812_configure_mux() For aesthetic reasons, instead of passing the struct usb_dt9812 pointer, pass the comedi_device pointer to this function. Signed-off-by: H Hartley Sweeten Cc: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/drivers/dt9812.c b/drivers/staging/comedi/drivers/dt9812.c index 7fb90a7c0234..965e96ddb8d1 100644 --- a/drivers/staging/comedi/drivers/dt9812.c +++ b/drivers/staging/comedi/drivers/dt9812.c @@ -446,10 +446,14 @@ static int dt9812_digital_out_shadow(struct comedi_device *dev, u8 *bits) return ret; } -static void dt9812_configure_mux(struct usb_dt9812 *dev, +static void dt9812_configure_mux(struct comedi_device *dev, struct dt9812_rmw_byte *rmw, int channel) { - 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; + + if (usb->device == DT9812_DEVID_DT9812_10) { /* In the DT9812/10V MUX is selected by P1.5-7 */ rmw->address = F020_SFR_P1; rmw->and_mask = 0xe0; @@ -536,7 +540,7 @@ static int dt9812_analog_in(struct comedi_device *dev, dt9812_configure_gain(dev, &rmw[0], gain); /* 2 set the MUX to select the channel */ - dt9812_configure_mux(slot->usb, &rmw[1], channel); + dt9812_configure_mux(dev, &rmw[1], channel); /* 3 start conversion */ rmw[2].address = F020_SFR_ADC0CN;