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

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

staging: comedi: addi_apci_035: separate from addi_common.h 



Remove the need to include addi_common.h by introducing a new private
data definition. Only include the members that are actually used by
the driver.

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 6a02623d

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

+7 −7
Original line number Original line Diff line number Diff line
@@ -118,7 +118,7 @@ static int apci035_timer_config(struct comedi_device *dev, 
				struct comedi_insn *insn,

				struct comedi_insn *insn,

				unsigned int *data)

				unsigned int *data)

{

{

	struct addi_private *devpriv = dev->private;

	struct apci035_private *devpriv = dev->private;

	unsigned int ui_Status;

	unsigned int ui_Status;

	unsigned int ui_Command;

	unsigned int ui_Command;

	unsigned int ui_Mode;

	unsigned int ui_Mode;
@@ -248,7 +248,7 @@ static int apci035_timer_write(struct comedi_device *dev, 
			       struct comedi_insn *insn,

			       struct comedi_insn *insn,

			       unsigned int *data)

			       unsigned int *data)

{

{

	struct addi_private *devpriv = dev->private;

	struct apci035_private *devpriv = dev->private;

	unsigned int ui_Command;

	unsigned int ui_Command;

	int i_Count;

	int i_Count;
@@ -345,7 +345,7 @@ static int apci035_timer_read(struct comedi_device *dev, 
			      struct comedi_insn *insn,

			      struct comedi_insn *insn,

			      unsigned int *data)

			      unsigned int *data)

{

{

	struct addi_private *devpriv = dev->private;

	struct apci035_private *devpriv = dev->private;

	unsigned int ui_Status;	/*  Status register */

	unsigned int ui_Status;	/*  Status register */





	i_WatchdogNbr = insn->unused[0];

	i_WatchdogNbr = insn->unused[0];
@@ -380,7 +380,7 @@ static int apci035_ai_config(struct comedi_device *dev, 
			     struct comedi_insn *insn,

			     struct comedi_insn *insn,

			     unsigned int *data)

			     unsigned int *data)

{

{

	struct addi_private *devpriv = dev->private;

	struct apci035_private *devpriv = dev->private;





	devpriv->tsk_Current = current;

	devpriv->tsk_Current = current;

	outl(0x200 | 0, devpriv->iobase + 128 + 0x4);

	outl(0x200 | 0, devpriv->iobase + 128 + 0x4);
@@ -404,7 +404,7 @@ static int apci035_ai_read(struct comedi_device *dev, 
			   struct comedi_insn *insn,

			   struct comedi_insn *insn,

			   unsigned int *data)

			   unsigned int *data)

{

{

	struct addi_private *devpriv = dev->private;

	struct apci035_private *devpriv = dev->private;

	unsigned int ui_CommandRegister;

	unsigned int ui_CommandRegister;





	/*  Set the start */

	/*  Set the start */
@@ -420,7 +420,7 @@ static int apci035_ai_read(struct comedi_device *dev, 




static int apci035_reset(struct comedi_device *dev)

static int apci035_reset(struct comedi_device *dev)

{

{

	struct addi_private *devpriv = dev->private;

	struct apci035_private *devpriv = dev->private;

	int i_Count;

	int i_Count;





	for (i_Count = 1; i_Count <= 4; i_Count++) {

	for (i_Count = 1; i_Count <= 4; i_Count++) {
@@ -437,7 +437,7 @@ static int apci035_reset(struct comedi_device *dev) 
static irqreturn_t apci035_interrupt(int irq, void *d)

static irqreturn_t apci035_interrupt(int irq, void *d)

{

{

	struct comedi_device *dev = d;

	struct comedi_device *dev = d;

	struct addi_private *devpriv = dev->private;

	struct apci035_private *devpriv = dev->private;

	unsigned int ui_StatusRegister1;

	unsigned int ui_StatusRegister1;

	unsigned int ui_StatusRegister2;

	unsigned int ui_StatusRegister2;

	unsigned int ui_ReadCommand;

	unsigned int ui_ReadCommand;

drivers/staging/comedi/drivers/addi_apci_035.c

+11 −2
Original line number Original line Diff line number Diff line 
#include <linux/module.h>

#include <linux/module.h>

#include <linux/pci.h>

#include <linux/pci.h>

#include <linux/sched.h>

#include <linux/interrupt.h>





#include "../comedidev.h"

#include "../comedidev.h"

#include "comedi_fc.h"

#include "comedi_fc.h"

#include "amcc_s5933.h"

#include "amcc_s5933.h"





#include "addi-data/addi_common.h"

struct apci035_private {

	int iobase;

	int i_IobaseAmcc;

	int i_IobaseAddon;

	int i_IobaseReserved;

	unsigned char b_TimerSelectMode;

	struct task_struct *tsk_Current;

};





#define ADDIDATA_WATCHDOG 2	/*  Or shold it be something else */

#define ADDIDATA_WATCHDOG 2	/*  Or shold it be something else */
@@ -15,7 +24,7 @@ static int apci035_auto_attach(struct comedi_device *dev, 
			       unsigned long context)

			       unsigned long context)

{

{

	struct pci_dev *pcidev = comedi_to_pci_dev(dev);

	struct pci_dev *pcidev = comedi_to_pci_dev(dev);

	struct addi_private *devpriv;

	struct apci035_private *devpriv;

	struct comedi_subdevice *s;

	struct comedi_subdevice *s;

	unsigned int dw_Dummy;

	unsigned int dw_Dummy;

	int ret;

	int ret;