AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2025-01-19 18:56:07 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

staging: comedi: addi_apci_035: separate from addi_common.h

Browse Source 
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: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
H Hartley Sweeten 2014-10-14 10:44:47 -07:00 committed by Greg Kroah-Hartman
parent 6a02623de5
commit 0317ffd281
2 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.c
View File

@ -118,7 +118,7 @@ static int apci035_timer_config(struct comedi_device *dev,
struct comedi_insn *insn,
unsigned int *data)
{
struct addi_private *devpriv = dev->private;
struct apci035_private *devpriv = dev->private;
unsigned int ui_Status;
unsigned int ui_Command;
unsigned int ui_Mode;
@ -248,7 +248,7 @@ static int apci035_timer_write(struct comedi_device *dev,
struct comedi_insn *insn,
unsigned int *data)
{
struct addi_private *devpriv = dev->private;
struct apci035_private *devpriv = dev->private;
unsigned int ui_Command;
int i_Count;
@ -345,7 +345,7 @@ static int apci035_timer_read(struct comedi_device *dev,
struct comedi_insn *insn,
unsigned int *data)
{
struct addi_private *devpriv = dev->private;
struct apci035_private *devpriv = dev->private;
unsigned int ui_Status; /* Status register */
i_WatchdogNbr = insn->unused[0];
@ -380,7 +380,7 @@ static int apci035_ai_config(struct comedi_device *dev,
struct comedi_insn *insn,
unsigned int *data)
{
struct addi_private *devpriv = dev->private;
struct apci035_private *devpriv = dev->private;
devpriv->tsk_Current = current;
outl(0x200 | 0, devpriv->iobase + 128 + 0x4);
@ -404,7 +404,7 @@ static int apci035_ai_read(struct comedi_device *dev,
struct comedi_insn *insn,
unsigned int *data)
{
struct addi_private *devpriv = dev->private;
struct apci035_private *devpriv = dev->private;
unsigned int ui_CommandRegister;
/* Set the start */
@ -420,7 +420,7 @@ static int apci035_ai_read(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;
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)
{
struct comedi_device *dev = d;
struct addi_private *devpriv = dev->private;
struct apci035_private *devpriv = dev->private;
unsigned int ui_StatusRegister1;
unsigned int ui_StatusRegister2;
unsigned int ui_ReadCommand;

13
drivers/staging/comedi/drivers/addi_apci_035.c
View File

@ -1,11 +1,20 @@
#include <linux/module.h>
#include <linux/pci.h>
#include <linux/sched.h>
#include <linux/interrupt.h>
#include "../comedidev.h"
#include "comedi_fc.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 */
@ -15,7 +24,7 @@ static int apci035_auto_attach(struct comedi_device *dev,
unsigned long context)
{
struct pci_dev *pcidev = comedi_to_pci_dev(dev);
struct addi_private *devpriv;
struct apci035_private *devpriv;
struct comedi_subdevice *s;
unsigned int dw_Dummy;
int ret;