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

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

staging: comedi: addi_apci_2200: absorb i_APCI2200_Reset() 



This is the only 'reset' function used by the driver, remove it
from the boardinfo and absorb the code from hwdrv_apci2200.c into
the driver.

Rename the CamelCase function i_ADDI_Reset() to apci2200_reset().

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 df9f604d

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

+0 −32
Original line number Original line Diff line number Diff line
@@ -229,35 +229,3 @@ static int i_APCI2200_ReadWatchdog(struct comedi_device *dev, 
		APCI2200_WATCHDOG_STATUS) & 0x1;

		APCI2200_WATCHDOG_STATUS) & 0x1;

	return insn->n;

	return insn->n;

}
 
}
 


/*

+----------------------------------------------------------------------------+

| Function   Name   : int i_APCI2200_Reset(struct comedi_device *dev)               |                                                                                                          |

+----------------------------------------------------------------------------+

| Task              :resets all the registers                                |

+----------------------------------------------------------------------------+

| Input Parameters  : struct comedi_device *dev

+----------------------------------------------------------------------------+

| Output Parameters :	--													 |

+----------------------------------------------------------------------------+

| Return Value      :                                                        |

|			                                                         |

+----------------------------------------------------------------------------+

*/



static int i_APCI2200_Reset(struct comedi_device *dev)

{

	struct addi_private *devpriv = dev->private;



	outw(0x0, devpriv->iobase + APCI2200_DIGITAL_OP);	/* RESETS THE DIGITAL OUTPUTS */

	outw(0x0,

		devpriv->iobase + APCI2200_WATCHDOG +

		APCI2200_WATCHDOG_ENABLEDISABLE);

	outw(0x0,

		devpriv->iobase + APCI2200_WATCHDOG +

		APCI2200_WATCHDOG_RELOAD_VALUE);

	outw(0x0,

		devpriv->iobase + APCI2200_WATCHDOG +

		APCI2200_WATCHDOG_RELOAD_VALUE + 2);

	return 0;

}

drivers/staging/comedi/drivers/addi_apci_2200.c

+12 −6
Original line number Original line Diff line number Diff line
@@ -17,7 +17,6 @@ static const struct addi_board apci2200_boardtypes[] = { 
		.i_NbrDiChannel		= 8,

		.i_NbrDiChannel		= 8,

		.i_NbrDoChannel		= 16,

		.i_NbrDoChannel		= 16,

		.i_Timer		= 1,

		.i_Timer		= 1,

		.reset			= i_APCI2200_Reset,

		.di_bits		= apci2200_di_insn_bits,

		.di_bits		= apci2200_di_insn_bits,

		.do_bits		= apci2200_do_insn_bits,

		.do_bits		= apci2200_do_insn_bits,

		.timer_config		= i_APCI2200_ConfigWatchdog,

		.timer_config		= i_APCI2200_ConfigWatchdog,
@@ -35,11 +34,18 @@ static irqreturn_t v_ADDI_Interrupt(int irq, void *d) 
	return IRQ_RETVAL(1);

	return IRQ_RETVAL(1);

}

}





static int i_ADDI_Reset(struct comedi_device *dev)

static int apci2200_reset(struct comedi_device *dev)

{

{

	const struct addi_board *this_board = comedi_board(dev);

	struct addi_private *devpriv = dev->private;



	outw(0x0, devpriv->iobase + APCI2200_DIGITAL_OP);

	outw(0x0, devpriv->iobase + APCI2200_WATCHDOG +

			APCI2200_WATCHDOG_ENABLEDISABLE);

	outw(0x0, devpriv->iobase + APCI2200_WATCHDOG +

			APCI2200_WATCHDOG_RELOAD_VALUE);

	outw(0x0, devpriv->iobase + APCI2200_WATCHDOG +

			APCI2200_WATCHDOG_RELOAD_VALUE + 2);





	this_board->reset(dev);

	return 0;

	return 0;

}

}
@@ -207,7 +213,7 @@ static int apci2200_auto_attach(struct comedi_device *dev, 
	s = &dev->subdevices[6];

	s = &dev->subdevices[6];

	s->type = COMEDI_SUBD_UNUSED;

	s->type = COMEDI_SUBD_UNUSED;





	i_ADDI_Reset(dev);

	apci2200_reset(dev);

	return 0;

	return 0;

}

}
@@ -218,7 +224,7 @@ static void apci2200_detach(struct comedi_device *dev) 




	if (devpriv) {

	if (devpriv) {

		if (dev->iobase)

		if (dev->iobase)

			i_ADDI_Reset(dev);

			apci2200_reset(dev);

		if (dev->irq)

		if (dev->irq)

			free_irq(dev->irq, dev);

			free_irq(dev->irq, dev);

		if (devpriv->dw_AiBase)

		if (devpriv->dw_AiBase)