From 30c4d3b862aa97c52a180c458f471e21a2e4db23 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Wed, 5 Sep 2012 18:44:26 -0700 Subject: [PATCH] staging: comedi: ke_counter: rename 'subdevice' variable to 's' Rename the variable used for the comedi_subdevice pointer from 'subdevice' to 's'. This is more typical in other comedi drivers and helps when searching with grep. Signed-off-by: H Hartley Sweeten Signed-off-by: Greg Kroah-Hartman --- drivers/staging/comedi/drivers/ke_counter.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/staging/comedi/drivers/ke_counter.c b/drivers/staging/comedi/drivers/ke_counter.c index a24e93278a48..a2d0bb43631c 100644 --- a/drivers/staging/comedi/drivers/ke_counter.c +++ b/drivers/staging/comedi/drivers/ke_counter.c @@ -125,7 +125,7 @@ static int cnt_attach_pci(struct comedi_device *dev, struct pci_dev *pcidev) { const struct cnt_board_struct *board; - struct comedi_subdevice *subdevice; + struct comedi_subdevice *s; int ret; comedi_set_hw_dev(dev, &pcidev->dev); @@ -145,15 +145,15 @@ static int cnt_attach_pci(struct comedi_device *dev, if (ret) return ret; - subdevice = dev->subdevices + 0; - dev->read_subdev = subdevice; + s = dev->subdevices + 0; + dev->read_subdev = s; - subdevice->type = COMEDI_SUBD_COUNTER; - subdevice->subdev_flags = SDF_READABLE /* | SDF_COMMON */ ; - subdevice->n_chan = board->cnt_channel_nbr; - subdevice->maxdata = (1 << board->cnt_bits) - 1; - subdevice->insn_read = cnt_rinsn; - subdevice->insn_write = cnt_winsn; + s->type = COMEDI_SUBD_COUNTER; + s->subdev_flags = SDF_READABLE /* | SDF_COMMON */ ; + s->n_chan = board->cnt_channel_nbr; + s->maxdata = (1 << board->cnt_bits) - 1; + s->insn_read = cnt_rinsn; + s->insn_write = cnt_winsn; /* select 20MHz clock */ outb(3, dev->iobase + 248); -- 2.20.1