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

staging: comedi: addi_apci_3120: move apci3120_addon_write() to driver 



Move this function from the included source file to the main driver
source file.

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 4ba10fc0

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

+0 −14
Original line number Diff line number Diff line 
static void apci3120_addon_write(struct comedi_device *dev,

				 unsigned int val, unsigned int reg)

{

	struct apci3120_private *devpriv = dev->private;



	/* 16-bit interface for AMCC add-on registers */



	outw(reg, devpriv->addon + APCI3120_ADDON_ADDR_REG);

	outw(val & 0xffff, devpriv->addon + APCI3120_ADDON_DATA_REG);



	outw(reg + 2, devpriv->addon + APCI3120_ADDON_ADDR_REG);

	outw((val >> 16) & 0xffff, devpriv->addon + APCI3120_ADDON_DATA_REG);

}



static int apci3120_cancel(struct comedi_device *dev,

			   struct comedi_subdevice *s)

{

drivers/staging/comedi/drivers/addi_apci_3120.c

+14 −0
Original line number Diff line number Diff line
@@ -163,6 +163,20 @@ struct apci3120_private { 
	unsigned short ctrl;

};



static void apci3120_addon_write(struct comedi_device *dev,

				 unsigned int val, unsigned int reg)

{

	struct apci3120_private *devpriv = dev->private;



	/* 16-bit interface for AMCC add-on registers */



	outw(reg, devpriv->addon + APCI3120_ADDON_ADDR_REG);

	outw(val & 0xffff, devpriv->addon + APCI3120_ADDON_DATA_REG);



	outw(reg + 2, devpriv->addon + APCI3120_ADDON_ADDR_REG);

	outw((val >> 16) & 0xffff, devpriv->addon + APCI3120_ADDON_DATA_REG);

}



/*

 * There are three timers on the board. They all use the same base

 * clock with a fixed prescaler for each timer. The base clock used