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

staging: comedi: addi_apci_1500: rename private data 'i_IobaseAddon' 



Rename this CamelCase member of the private data.

Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 784801d7

drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c

+8 −12
Original line number Diff line number Diff line
@@ -600,7 +600,7 @@ static int apci1500_di_insn_bits(struct comedi_device *dev, 
{

	struct apci1500_private *devpriv = dev->private;



	data[1] = inw(devpriv->i_IobaseAddon + APCI1500_DIGITAL_IP);

	data[1] = inw(devpriv->addon + APCI1500_DIGITAL_IP);



	return insn->n;

}
@@ -641,8 +641,7 @@ static int apci1500_do_write(struct comedi_device *dev, 
	if (data[3] == 0) {

		if (data[1] == 0) {

			data[0] = (data[0] << ui_NoOfChannel) | ui_Temp;

			outw(data[0],

				devpriv->i_IobaseAddon + APCI1500_DIGITAL_OP);

			outw(data[0], devpriv->addon + APCI1500_DIGITAL_OP);

		} else {

			if (data[1] == 1) {

				switch (ui_NoOfChannel) {
@@ -677,8 +676,7 @@ static int apci1500_do_write(struct comedi_device *dev, 
				}



				outw(data[0],

					devpriv->i_IobaseAddon +

					APCI1500_DIGITAL_OP);

				     devpriv->addon + APCI1500_DIGITAL_OP);

			} else {

				dev_warn(dev->class_dev,

					"Specified channel not supported\n");
@@ -697,8 +695,7 @@ static int apci1500_do_write(struct comedi_device *dev, 
					0xffffffff;

				data[0] = data[0] & ui_Temp;

				outw(data[0],

					devpriv->i_IobaseAddon +

					APCI1500_DIGITAL_OP);

				     devpriv->addon + APCI1500_DIGITAL_OP);

			} else {

				if (data[1] == 1) {

					switch (ui_NoOfChannel) {
@@ -752,8 +749,7 @@ static int apci1500_do_write(struct comedi_device *dev, 


					}



					outw(data[0],

						devpriv->i_IobaseAddon +

					outw(data[0], devpriv->addon +

					     APCI1500_DIGITAL_OP);

				} else {

					dev_warn(dev->class_dev,
@@ -797,7 +793,7 @@ static int apci1500_timer_config(struct comedi_device *dev, 


	/* Selection of the input clock */

	if (data[0] == 0 || data[0] == 1 || data[0] == 2) {

		outw(data[0], devpriv->i_IobaseAddon + APCI1500_CLK_SELECT);

		outw(data[0], devpriv->addon + APCI1500_CLK_SELECT);

	} else {

		if (data[0] != 3) {

			dev_warn(dev->class_dev,
@@ -1629,7 +1625,7 @@ static int apci1500_reset(struct comedi_device *dev) 
	z8536_reset(dev);



	/* reset all the digital outputs */

	outw(0x0, devpriv->i_IobaseAddon + APCI1500_DIGITAL_OP);

	outw(0x0, devpriv->addon + APCI1500_DIGITAL_OP);



	/* Deactivates all interrupts */

	z8536_write(dev, 0x00, APCI1500_RW_MASTER_INTERRUPT_CONTROL);

drivers/staging/comedi/drivers/addi_apci_1500.c

+2 −2
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 


struct apci1500_private {

	unsigned long amcc;

	int i_IobaseAddon;

	unsigned long addon;

	unsigned char b_OutputMemoryStatus;

	struct task_struct *tsk_Current;

};
@@ -47,7 +47,7 @@ static int apci1500_auto_attach(struct comedi_device *dev, 


	dev->iobase = pci_resource_start(pcidev, 1);

	devpriv->amcc = pci_resource_start(pcidev, 0);

	devpriv->i_IobaseAddon = pci_resource_start(pcidev, 2);

	devpriv->addon = pci_resource_start(pcidev, 2);



	if (pcidev->irq > 0) {

		ret = request_irq(pcidev->irq, apci1500_interrupt, IRQF_SHARED,