From: H Hartley Sweeten Date: Tue, 14 May 2013 21:21:08 +0000 (-0700) Subject: staging: comedi: dt9812: rename the private data struct X-Git-Tag: next-20130521~23^2~82 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=415227c130db90d5b3db8aff5782af21deba78c5;p=karo-tx-linux.git staging: comedi: dt9812: rename the private data struct The comedi private data (dev->private) for this driver is stored in a 'struct comedi_dt9812' that is allocated during the comedi (*attach). For aesthetic reasons, rename this struct to help make its use clearer. 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 f187925a180a..316843d5d6b4 100644 --- a/drivers/staging/comedi/drivers/dt9812.c +++ b/drivers/staging/comedi/drivers/dt9812.c @@ -279,7 +279,7 @@ struct usb_dt9812 { u8 digital_out_shadow; }; -struct comedi_dt9812 { +struct dt9812_private { struct slot_dt9812 *slot; u32 serial; }; @@ -288,7 +288,7 @@ struct slot_dt9812 { struct semaphore mutex; u32 serial; struct usb_dt9812 *usb; - struct comedi_dt9812 *comedi; + struct dt9812_private *comedi; }; static struct slot_dt9812 dt9812[DT9812_NUM_SLOTS]; @@ -660,7 +660,7 @@ static int dt9812_analog_out(struct slot_dt9812 *slot, int channel, u16 value) static int dt9812_comedi_open(struct comedi_device *dev) { - struct comedi_dt9812 *devpriv = dev->private; + struct dt9812_private *devpriv = dev->private; int result = -ENODEV; down(&devpriv->slot->mutex); @@ -715,7 +715,7 @@ static int dt9812_di_rinsn(struct comedi_device *dev, struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) { - struct comedi_dt9812 *devpriv = dev->private; + struct dt9812_private *devpriv = dev->private; unsigned int channel = CR_CHAN(insn->chanspec); int n; u8 bits = 0; @@ -730,7 +730,7 @@ static int dt9812_do_winsn(struct comedi_device *dev, struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) { - struct comedi_dt9812 *devpriv = dev->private; + struct dt9812_private *devpriv = dev->private; unsigned int channel = CR_CHAN(insn->chanspec); int n; u8 bits = 0; @@ -751,7 +751,7 @@ static int dt9812_ai_rinsn(struct comedi_device *dev, struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) { - struct comedi_dt9812 *devpriv = dev->private; + struct dt9812_private *devpriv = dev->private; unsigned int channel = CR_CHAN(insn->chanspec); int n; @@ -768,7 +768,7 @@ static int dt9812_ao_rinsn(struct comedi_device *dev, struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) { - struct comedi_dt9812 *devpriv = dev->private; + struct dt9812_private *devpriv = dev->private; unsigned int channel = CR_CHAN(insn->chanspec); int n; u16 value; @@ -785,7 +785,7 @@ static int dt9812_ao_winsn(struct comedi_device *dev, struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) { - struct comedi_dt9812 *devpriv = dev->private; + struct dt9812_private *devpriv = dev->private; unsigned int channel = CR_CHAN(insn->chanspec); int n; @@ -796,7 +796,7 @@ static int dt9812_ao_winsn(struct comedi_device *dev, static int dt9812_attach(struct comedi_device *dev, struct comedi_devconfig *it) { - struct comedi_dt9812 *devpriv; + struct dt9812_private *devpriv; int i; struct comedi_subdevice *s; int ret;