Skip to content

L
linux
Commit 0e05c552 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files
Options

staging: comedi: ni_mio_common: remove devpriv macro 

The ni_mio_common.c file is #include'd by the ni_atmio, ni_mio_cs,
and ni_pcimio drivers. Those drivers all have a devpriv macro of
this type:

This macro relies on a local variable having a specific name.
Remove its use in all the files by replacing it with a local
variable.

Some of the functions in ni_mio_common.c don't always use the
devpriv variable due to differences in how the low-level i/o
is handled by the driver. Tag the variable in those functions
with __maybe_unused to avoid compile warnings.
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 843690b7
Hide whitespace changes
Inline Side-by-side
Showing with 180 additions and 14 deletions
drivers/staging/comedi/drivers/ni_atmio.c
View file @ 0e05c552
...@@ -284,8 +284,6 @@ struct ni_private { ...@@ -284,8 +284,6 @@ struct ni_private {
}; };
#define devpriv ((struct ni_private *)dev->private)
/* How we access registers */ /* How we access registers */
#define ni_writel(a, b) (outl((a), (b)+dev->iobase)) #define ni_writel(a, b) (outl((a), (b)+dev->iobase))
...@@ -303,6 +301,7 @@ struct ni_private { ...@@ -303,6 +301,7 @@ struct ni_private {
static void ni_atmio_win_out(struct comedi_device *dev, uint16_t data, int addr) static void ni_atmio_win_out(struct comedi_device *dev, uint16_t data, int addr)
{ {
struct ni_private *devpriv = dev->private;
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&devpriv->window_lock, flags); spin_lock_irqsave(&devpriv->window_lock, flags);
...@@ -317,6 +316,7 @@ static void ni_atmio_win_out(struct comedi_device *dev, uint16_t data, int addr) ...@@ -317,6 +316,7 @@ static void ni_atmio_win_out(struct comedi_device *dev, uint16_t data, int addr)
static uint16_t ni_atmio_win_in(struct comedi_device *dev, int addr) static uint16_t ni_atmio_win_in(struct comedi_device *dev, int addr)
{ {
struct ni_private *devpriv = dev->private;
unsigned long flags; unsigned long flags;
uint16_t ret; uint16_t ret;
...@@ -406,16 +406,17 @@ static int ni_getboardtype(struct comedi_device *dev) ...@@ -406,16 +406,17 @@ static int ni_getboardtype(struct comedi_device *dev)
static int ni_atmio_attach(struct comedi_device *dev, static int ni_atmio_attach(struct comedi_device *dev,
struct comedi_devconfig *it) struct comedi_devconfig *it)
{ {
struct ni_private *devpriv;
struct pnp_dev *isapnp_dev; struct pnp_dev *isapnp_dev;
int ret; int ret;
unsigned long iobase; unsigned long iobase;
int board; int board;
unsigned int irq; unsigned int irq;
/* allocate private area */
ret = ni_alloc_private(dev); ret = ni_alloc_private(dev);
if (ret < 0) if (ret)
return ret; return ret;
devpriv = dev->private;
devpriv->stc_writew = &ni_atmio_win_out; devpriv->stc_writew = &ni_atmio_win_out;
devpriv->stc_readw = &ni_atmio_win_in; devpriv->stc_readw = &ni_atmio_win_in;
...@@ -499,6 +500,8 @@ static int ni_atmio_attach(struct comedi_device *dev, ...@@ -499,6 +500,8 @@ static int ni_atmio_attach(struct comedi_device *dev,
static void ni_atmio_detach(struct comedi_device *dev) static void ni_atmio_detach(struct comedi_device *dev)
{ {
struct ni_private *devpriv = dev->private;
mio_common_detach(dev); mio_common_detach(dev);
if (dev->iobase) if (dev->iobase)
release_region(dev->iobase, NI_SIZE); release_region(dev->iobase, NI_SIZE);
......
drivers/staging/comedi/drivers/ni_mio_common.c
View file @ 0e05c552
...@@ -410,6 +410,7 @@ static void get_last_sample_6143(struct comedi_device *dev); ...@@ -410,6 +410,7 @@ static void get_last_sample_6143(struct comedi_device *dev);
static inline void ni_set_bitfield(struct comedi_device *dev, int reg, static inline void ni_set_bitfield(struct comedi_device *dev, int reg,
unsigned bit_mask, unsigned bit_values) unsigned bit_mask, unsigned bit_values)
{ {
struct ni_private *devpriv = dev->private;
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&devpriv->soft_reg_copy_lock, flags); spin_lock_irqsave(&devpriv->soft_reg_copy_lock, flags);
...@@ -506,6 +507,7 @@ static inline void ni_set_gpct_dma_channel(struct comedi_device *dev, ...@@ -506,6 +507,7 @@ static inline void ni_set_gpct_dma_channel(struct comedi_device *dev,
static inline void ni_set_cdo_dma_channel(struct comedi_device *dev, static inline void ni_set_cdo_dma_channel(struct comedi_device *dev,
int mite_channel) int mite_channel)
{ {
struct ni_private *devpriv = dev->private;
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&devpriv->soft_reg_copy_lock, flags); spin_lock_irqsave(&devpriv->soft_reg_copy_lock, flags);
...@@ -525,6 +527,7 @@ static inline void ni_set_cdo_dma_channel(struct comedi_device *dev, ...@@ -525,6 +527,7 @@ static inline void ni_set_cdo_dma_channel(struct comedi_device *dev,
static int ni_request_ai_mite_channel(struct comedi_device *dev) static int ni_request_ai_mite_channel(struct comedi_device *dev)
{ {
struct ni_private *devpriv = dev->private;
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&devpriv->mite_channel_lock, flags); spin_lock_irqsave(&devpriv->mite_channel_lock, flags);
...@@ -545,6 +548,7 @@ static int ni_request_ai_mite_channel(struct comedi_device *dev) ...@@ -545,6 +548,7 @@ static int ni_request_ai_mite_channel(struct comedi_device *dev)
static int ni_request_ao_mite_channel(struct comedi_device *dev) static int ni_request_ao_mite_channel(struct comedi_device *dev)
{ {
struct ni_private *devpriv = dev->private;
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&devpriv->mite_channel_lock, flags); spin_lock_irqsave(&devpriv->mite_channel_lock, flags);
...@@ -567,6 +571,7 @@ static int ni_request_gpct_mite_channel(struct comedi_device *dev, ...@@ -567,6 +571,7 @@ static int ni_request_gpct_mite_channel(struct comedi_device *dev,
unsigned gpct_index, unsigned gpct_index,
enum comedi_io_direction direction) enum comedi_io_direction direction)
{ {
struct ni_private *devpriv = dev->private;
unsigned long flags; unsigned long flags;
struct mite_channel *mite_chan; struct mite_channel *mite_chan;
...@@ -595,6 +600,7 @@ static int ni_request_gpct_mite_channel(struct comedi_device *dev, ...@@ -595,6 +600,7 @@ static int ni_request_gpct_mite_channel(struct comedi_device *dev,
static int ni_request_cdo_mite_channel(struct comedi_device *dev) static int ni_request_cdo_mite_channel(struct comedi_device *dev)
{ {
#ifdef PCIDMA #ifdef PCIDMA
struct ni_private *devpriv = dev->private;
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&devpriv->mite_channel_lock, flags); spin_lock_irqsave(&devpriv->mite_channel_lock, flags);
...@@ -617,6 +623,7 @@ static int ni_request_cdo_mite_channel(struct comedi_device *dev) ...@@ -617,6 +623,7 @@ static int ni_request_cdo_mite_channel(struct comedi_device *dev)
static void ni_release_ai_mite_channel(struct comedi_device *dev) static void ni_release_ai_mite_channel(struct comedi_device *dev)
{ {
#ifdef PCIDMA #ifdef PCIDMA
struct ni_private *devpriv = dev->private;
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&devpriv->mite_channel_lock, flags); spin_lock_irqsave(&devpriv->mite_channel_lock, flags);
...@@ -632,6 +639,7 @@ static void ni_release_ai_mite_channel(struct comedi_device *dev) ...@@ -632,6 +639,7 @@ static void ni_release_ai_mite_channel(struct comedi_device *dev)
static void ni_release_ao_mite_channel(struct comedi_device *dev) static void ni_release_ao_mite_channel(struct comedi_device *dev)
{ {
#ifdef PCIDMA #ifdef PCIDMA
struct ni_private *devpriv = dev->private;
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&devpriv->mite_channel_lock, flags); spin_lock_irqsave(&devpriv->mite_channel_lock, flags);
...@@ -648,6 +656,7 @@ static void ni_release_ao_mite_channel(struct comedi_device *dev) ...@@ -648,6 +656,7 @@ static void ni_release_ao_mite_channel(struct comedi_device *dev)
static void ni_release_gpct_mite_channel(struct comedi_device *dev, static void ni_release_gpct_mite_channel(struct comedi_device *dev,
unsigned gpct_index) unsigned gpct_index)
{ {
struct ni_private *devpriv = dev->private;
unsigned long flags; unsigned long flags;
BUG_ON(gpct_index >= NUM_GPCT); BUG_ON(gpct_index >= NUM_GPCT);
...@@ -669,6 +678,7 @@ static void ni_release_gpct_mite_channel(struct comedi_device *dev, ...@@ -669,6 +678,7 @@ static void ni_release_gpct_mite_channel(struct comedi_device *dev,
static void ni_release_cdo_mite_channel(struct comedi_device *dev) static void ni_release_cdo_mite_channel(struct comedi_device *dev)
{ {
#ifdef PCIDMA #ifdef PCIDMA
struct ni_private *devpriv = dev->private;
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&devpriv->mite_channel_lock, flags); spin_lock_irqsave(&devpriv->mite_channel_lock, flags);
...@@ -686,6 +696,8 @@ static void ni_release_cdo_mite_channel(struct comedi_device *dev) ...@@ -686,6 +696,8 @@ static void ni_release_cdo_mite_channel(struct comedi_device *dev)
static void ni_e_series_enable_second_irq(struct comedi_device *dev, static void ni_e_series_enable_second_irq(struct comedi_device *dev,
unsigned gpct_index, short enable) unsigned gpct_index, short enable)
{ {
struct ni_private *devpriv = dev->private;
if (boardtype.reg_type & ni_reg_m_series_mask) if (boardtype.reg_type & ni_reg_m_series_mask)
return; return;
switch (gpct_index) { switch (gpct_index) {
...@@ -716,6 +728,8 @@ static void ni_e_series_enable_second_irq(struct comedi_device *dev, ...@@ -716,6 +728,8 @@ static void ni_e_series_enable_second_irq(struct comedi_device *dev,
static void ni_clear_ai_fifo(struct comedi_device *dev) static void ni_clear_ai_fifo(struct comedi_device *dev)
{ {
struct ni_private *devpriv = dev->private;
if (boardtype.reg_type == ni_reg_6143) { if (boardtype.reg_type == ni_reg_6143) {
/* Flush the 6143 data FIFO */ /* Flush the 6143 data FIFO */
ni_writel(0x10, AIFIFO_Control_6143); /* Flush fifo */ ni_writel(0x10, AIFIFO_Control_6143); /* Flush fifo */
...@@ -742,13 +756,17 @@ static void ni_clear_ai_fifo(struct comedi_device *dev) ...@@ -742,13 +756,17 @@ static void ni_clear_ai_fifo(struct comedi_device *dev)
static void win_out2(struct comedi_device *dev, uint32_t data, int reg) static void win_out2(struct comedi_device *dev, uint32_t data, int reg)
{ {
struct ni_private *devpriv = dev->private;
devpriv->stc_writew(dev, data >> 16, reg); devpriv->stc_writew(dev, data >> 16, reg);
devpriv->stc_writew(dev, data & 0xffff, reg + 1); devpriv->stc_writew(dev, data & 0xffff, reg + 1);
} }
static uint32_t win_in2(struct comedi_device *dev, int reg) static uint32_t win_in2(struct comedi_device *dev, int reg)
{ {
struct ni_private *devpriv = dev->private;
uint32_t bits; uint32_t bits;
bits = devpriv->stc_readw(dev, reg) << 16; bits = devpriv->stc_readw(dev, reg) << 16;
bits |= devpriv->stc_readw(dev, reg + 1); bits |= devpriv->stc_readw(dev, reg + 1);
return bits; return bits;
...@@ -758,6 +776,7 @@ static uint32_t win_in2(struct comedi_device *dev, int reg) ...@@ -758,6 +776,7 @@ static uint32_t win_in2(struct comedi_device *dev, int reg)
static inline void ni_ao_win_outw(struct comedi_device *dev, uint16_t data, static inline void ni_ao_win_outw(struct comedi_device *dev, uint16_t data,
int addr) int addr)
{ {
struct ni_private *devpriv = dev->private;
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&devpriv->window_lock, flags); spin_lock_irqsave(&devpriv->window_lock, flags);
...@@ -769,6 +788,7 @@ static inline void ni_ao_win_outw(struct comedi_device *dev, uint16_t data, ...@@ -769,6 +788,7 @@ static inline void ni_ao_win_outw(struct comedi_device *dev, uint16_t data,
static inline void ni_ao_win_outl(struct comedi_device *dev, uint32_t data, static inline void ni_ao_win_outl(struct comedi_device *dev, uint32_t data,
int addr) int addr)
{ {
struct ni_private *devpriv = dev->private;
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&devpriv->window_lock, flags); spin_lock_irqsave(&devpriv->window_lock, flags);
...@@ -779,6 +799,7 @@ static inline void ni_ao_win_outl(struct comedi_device *dev, uint32_t data, ...@@ -779,6 +799,7 @@ static inline void ni_ao_win_outl(struct comedi_device *dev, uint32_t data,
static inline unsigned short ni_ao_win_inw(struct comedi_device *dev, int addr) static inline unsigned short ni_ao_win_inw(struct comedi_device *dev, int addr)
{ {
struct ni_private *devpriv = dev->private;
unsigned long flags; unsigned long flags;
unsigned short data; unsigned short data;
...@@ -814,6 +835,7 @@ static inline void ni_set_bits(struct comedi_device *dev, int reg, ...@@ -814,6 +835,7 @@ static inline void ni_set_bits(struct comedi_device *dev, int reg,
static irqreturn_t ni_E_interrupt(int irq, void *d) static irqreturn_t ni_E_interrupt(int irq, void *d)
{ {
struct comedi_device *dev = d; struct comedi_device *dev = d;
struct ni_private *devpriv = dev->private;
unsigned short a_status; unsigned short a_status;
unsigned short b_status; unsigned short b_status;
unsigned int ai_mite_status = 0; unsigned int ai_mite_status = 0;
...@@ -872,6 +894,7 @@ static irqreturn_t ni_E_interrupt(int irq, void *d) ...@@ -872,6 +894,7 @@ static irqreturn_t ni_E_interrupt(int irq, void *d)
#ifdef PCIDMA #ifdef PCIDMA
static void ni_sync_ai_dma(struct comedi_device *dev) static void ni_sync_ai_dma(struct comedi_device *dev)
{ {
struct ni_private *devpriv = dev->private;
struct comedi_subdevice *s = &dev->subdevices[NI_AI_SUBDEV]; struct comedi_subdevice *s = &dev->subdevices[NI_AI_SUBDEV];
unsigned long flags; unsigned long flags;
...@@ -884,6 +907,7 @@ static void ni_sync_ai_dma(struct comedi_device *dev) ...@@ -884,6 +907,7 @@ static void ni_sync_ai_dma(struct comedi_device *dev)
static void mite_handle_b_linkc(struct mite_struct *mite, static void mite_handle_b_linkc(struct mite_struct *mite,
struct comedi_device *dev) struct comedi_device *dev)
{ {
struct ni_private *devpriv = dev->private;
struct comedi_subdevice *s = &dev->subdevices[NI_AO_SUBDEV]; struct comedi_subdevice *s = &dev->subdevices[NI_AO_SUBDEV];
unsigned long flags; unsigned long flags;
...@@ -896,6 +920,7 @@ static void mite_handle_b_linkc(struct mite_struct *mite, ...@@ -896,6 +920,7 @@ static void mite_handle_b_linkc(struct mite_struct *mite,
static int ni_ao_wait_for_dma_load(struct comedi_device *dev) static int ni_ao_wait_for_dma_load(struct comedi_device *dev)
{ {
struct ni_private *devpriv = dev->private;
static const int timeout = 10000; static const int timeout = 10000;
int i; int i;
for (i = 0; i < timeout; i++) { for (i = 0; i < timeout; i++) {
...@@ -918,6 +943,8 @@ static int ni_ao_wait_for_dma_load(struct comedi_device *dev) ...@@ -918,6 +943,8 @@ static int ni_ao_wait_for_dma_load(struct comedi_device *dev)
#endif /* PCIDMA */ #endif /* PCIDMA */
static void ni_handle_eos(struct comedi_device *dev, struct comedi_subdevice *s) static void ni_handle_eos(struct comedi_device *dev, struct comedi_subdevice *s)
{ {
struct ni_private *devpriv = dev->private;
if (devpriv->aimode == AIMODE_SCAN) { if (devpriv->aimode == AIMODE_SCAN) {
#ifdef PCIDMA #ifdef PCIDMA
static const int timeout = 10; static const int timeout = 10;
...@@ -984,6 +1011,7 @@ static void handle_gpct_interrupt(struct comedi_device *dev, ...@@ -984,6 +1011,7 @@ static void handle_gpct_interrupt(struct comedi_device *dev,
unsigned short counter_index) unsigned short counter_index)
{ {
#ifdef PCIDMA #ifdef PCIDMA
struct ni_private *devpriv = dev->private;
struct comedi_subdevice *s; struct comedi_subdevice *s;
s = &dev->subdevices[NI_GPCT_SUBDEV(counter_index)]; s = &dev->subdevices[NI_GPCT_SUBDEV(counter_index)];
...@@ -997,6 +1025,7 @@ static void handle_gpct_interrupt(struct comedi_device *dev, ...@@ -997,6 +1025,7 @@ static void handle_gpct_interrupt(struct comedi_device *dev,
static void ack_a_interrupt(struct comedi_device *dev, unsigned short a_status) static void ack_a_interrupt(struct comedi_device *dev, unsigned short a_status)
{ {
struct ni_private *devpriv = dev->private;
unsigned short ack = 0; unsigned short ack = 0;
if (a_status & AI_SC_TC_St) { if (a_status & AI_SC_TC_St) {
...@@ -1019,6 +1048,7 @@ static void ack_a_interrupt(struct comedi_device *dev, unsigned short a_status) ...@@ -1019,6 +1048,7 @@ static void ack_a_interrupt(struct comedi_device *dev, unsigned short a_status)
static void handle_a_interrupt(struct comedi_device *dev, unsigned short status, static void handle_a_interrupt(struct comedi_device *dev, unsigned short status,
unsigned ai_mite_status) unsigned ai_mite_status)
{ {
struct ni_private *devpriv = dev->private;
struct comedi_subdevice *s = &dev->subdevices[NI_AI_SUBDEV]; struct comedi_subdevice *s = &dev->subdevices[NI_AI_SUBDEV];
/* 67xx boards don't have ai subdevice, but their gpct0 might generate an a interrupt */ /* 67xx boards don't have ai subdevice, but their gpct0 might generate an a interrupt */
...@@ -1122,7 +1152,9 @@ static void handle_a_interrupt(struct comedi_device *dev, unsigned short status, ...@@ -1122,7 +1152,9 @@ static void handle_a_interrupt(struct comedi_device *dev, unsigned short status,
static void ack_b_interrupt(struct comedi_device *dev, unsigned short b_status) static void ack_b_interrupt(struct comedi_device *dev, unsigned short b_status)
{ {
struct ni_private *devpriv = dev->private;
unsigned short ack = 0; unsigned short ack = 0;
if (b_status & AO_BC_TC_St) { if (b_status & AO_BC_TC_St) {
ack |= AO_BC_TC_Interrupt_Ack; ack |= AO_BC_TC_Interrupt_Ack;
} }
...@@ -1151,8 +1183,10 @@ static void ack_b_interrupt(struct comedi_device *dev, unsigned short b_status) ...@@ -1151,8 +1183,10 @@ static void ack_b_interrupt(struct comedi_device *dev, unsigned short b_status)
static void handle_b_interrupt(struct comedi_device *dev, static void handle_b_interrupt(struct comedi_device *dev,
unsigned short b_status, unsigned ao_mite_status) unsigned short b_status, unsigned ao_mite_status)
{ {
struct ni_private *devpriv = dev->private;
struct comedi_subdevice *s = &dev->subdevices[NI_AO_SUBDEV]; struct comedi_subdevice *s = &dev->subdevices[NI_AO_SUBDEV];
/* unsigned short ack=0; */ /* unsigned short ack=0; */
#ifdef DEBUG_INTERRUPT #ifdef DEBUG_INTERRUPT
printk("ni_mio_common: interrupt: b_status=%04x m1_status=%08x\n", printk("ni_mio_common: interrupt: b_status=%04x m1_status=%08x\n",
b_status, ao_mite_status); b_status, ao_mite_status);
...@@ -1340,6 +1374,7 @@ static int ni_ao_fifo_half_empty(struct comedi_device *dev, ...@@ -1340,6 +1374,7 @@ static int ni_ao_fifo_half_empty(struct comedi_device *dev,
static int ni_ao_prep_fifo(struct comedi_device *dev, static int ni_ao_prep_fifo(struct comedi_device *dev,
struct comedi_subdevice *s) struct comedi_subdevice *s)
{ {
struct ni_private *devpriv = dev->private;
int n; int n;
/* reset fifo */ /* reset fifo */
...@@ -1364,6 +1399,7 @@ static int ni_ao_prep_fifo(struct comedi_device *dev, ...@@ -1364,6 +1399,7 @@ static int ni_ao_prep_fifo(struct comedi_device *dev,
static void ni_ai_fifo_read(struct comedi_device *dev, static void ni_ai_fifo_read(struct comedi_device *dev,
struct comedi_subdevice *s, int n) struct comedi_subdevice *s, int n)
{ {
struct ni_private *devpriv = dev->private;
struct comedi_async *async = s->async; struct comedi_async *async = s->async;
int i; int i;
...@@ -1434,6 +1470,7 @@ static void ni_handle_fifo_half_full(struct comedi_device *dev) ...@@ -1434,6 +1470,7 @@ static void ni_handle_fifo_half_full(struct comedi_device *dev)
#ifdef PCIDMA #ifdef PCIDMA
static int ni_ai_drain_dma(struct comedi_device *dev) static int ni_ai_drain_dma(struct comedi_device *dev)
{ {
struct ni_private *devpriv = dev->private;
int i; int i;
static const int timeout = 10000; static const int timeout = 10000;
unsigned long flags; unsigned long flags;
...@@ -1471,6 +1508,7 @@ static int ni_ai_drain_dma(struct comedi_device *dev) ...@@ -1471,6 +1508,7 @@ static int ni_ai_drain_dma(struct comedi_device *dev)
*/ */
static void ni_handle_fifo_dregs(struct comedi_device *dev) static void ni_handle_fifo_dregs(struct comedi_device *dev)
{ {
struct ni_private *devpriv = dev->private;
struct comedi_subdevice *s = &dev->subdevices[NI_AI_SUBDEV]; struct comedi_subdevice *s = &dev->subdevices[NI_AI_SUBDEV];
short data[2]; short data[2];
u32 dl; u32 dl;
...@@ -1535,6 +1573,7 @@ static void ni_handle_fifo_dregs(struct comedi_device *dev) ...@@ -1535,6 +1573,7 @@ static void ni_handle_fifo_dregs(struct comedi_device *dev)
static void get_last_sample_611x(struct comedi_device *dev) static void get_last_sample_611x(struct comedi_device *dev)
{ {
struct ni_private *devpriv __maybe_unused = dev->private;
struct comedi_subdevice *s = &dev->subdevices[NI_AI_SUBDEV]; struct comedi_subdevice *s = &dev->subdevices[NI_AI_SUBDEV];
short data; short data;
u32 dl; u32 dl;
...@@ -1552,6 +1591,7 @@ static void get_last_sample_611x(struct comedi_device *dev) ...@@ -1552,6 +1591,7 @@ static void get_last_sample_611x(struct comedi_device *dev)
static void get_last_sample_6143(struct comedi_device *dev) static void get_last_sample_6143(struct comedi_device *dev)
{ {
struct ni_private *devpriv __maybe_unused = dev->private;
struct comedi_subdevice *s = &dev->subdevices[NI_AI_SUBDEV]; struct comedi_subdevice *s = &dev->subdevices[NI_AI_SUBDEV];
short data; short data;
u32 dl; u32 dl;
...@@ -1574,11 +1614,13 @@ static void ni_ai_munge(struct comedi_device *dev, struct comedi_subdevice *s, ...@@ -1574,11 +1614,13 @@ static void ni_ai_munge(struct comedi_device *dev, struct comedi_subdevice *s,
void *data, unsigned int num_bytes, void *data, unsigned int num_bytes,
unsigned int chan_index) unsigned int chan_index)
{ {
struct ni_private *devpriv = dev->private;
struct comedi_async *async = s->async; struct comedi_async *async = s->async;
unsigned int i; unsigned int i;
unsigned int length = num_bytes / bytes_per_sample(s); unsigned int length = num_bytes / bytes_per_sample(s);
short *array = data; short *array = data;
unsigned int *larray = data; unsigned int *larray = data;
for (i = 0; i < length; i++) { for (i = 0; i < length; i++) {
#ifdef PCIDMA #ifdef PCIDMA
if (s->subdev_flags & SDF_LSAMPL) if (s->subdev_flags & SDF_LSAMPL)
...@@ -1599,6 +1641,7 @@ static void ni_ai_munge(struct comedi_device *dev, struct comedi_subdevice *s, ...@@ -1599,6 +1641,7 @@ static void ni_ai_munge(struct comedi_device *dev, struct comedi_subdevice *s,
static int ni_ai_setup_MITE_dma(struct comedi_device *dev) static int ni_ai_setup_MITE_dma(struct comedi_device *dev)
{ {
struct ni_private *devpriv = dev->private;
struct comedi_subdevice *s = &dev->subdevices[NI_AI_SUBDEV]; struct comedi_subdevice *s = &dev->subdevices[NI_AI_SUBDEV];
int retval; int retval;
unsigned long flags; unsigned long flags;
...@@ -1638,6 +1681,7 @@ static int ni_ai_setup_MITE_dma(struct comedi_device *dev) ...@@ -1638,6 +1681,7 @@ static int ni_ai_setup_MITE_dma(struct comedi_device *dev)
static int ni_ao_setup_MITE_dma(struct comedi_device *dev) static int ni_ao_setup_MITE_dma(struct comedi_device *dev)
{ {
struct ni_private *devpriv = dev->private;
struct comedi_subdevice *s = &dev->subdevices[NI_AO_SUBDEV]; struct comedi_subdevice *s = &dev->subdevices[NI_AO_SUBDEV];
int retval; int retval;
unsigned long flags; unsigned long flags;
...@@ -1676,6 +1720,8 @@ static int ni_ao_setup_MITE_dma(struct comedi_device *dev) ...@@ -1676,6 +1720,8 @@ static int ni_ao_setup_MITE_dma(struct comedi_device *dev)
static int ni_ai_reset(struct comedi_device *dev, struct comedi_subdevice *s) static int ni_ai_reset(struct comedi_device *dev, struct comedi_subdevice *s)
{ {
struct ni_private *devpriv = dev->private;
ni_release_ai_mite_channel(dev); ni_release_ai_mite_channel(dev);
/* ai configuration */ /* ai configuration */
devpriv->stc_writew(dev, AI_Configuration_Start | AI_Reset, devpriv->stc_writew(dev, AI_Configuration_Start | AI_Reset,
...@@ -1786,6 +1832,7 @@ static int ni_ai_insn_read(struct comedi_device *dev, ...@@ -1786,6 +1832,7 @@ static int ni_ai_insn_read(struct comedi_device *dev,
struct comedi_subdevice *s, struct comedi_insn *insn, struct comedi_subdevice *s, struct comedi_insn *insn,
unsigned int *data) unsigned int *data)
{ {
struct ni_private *devpriv = dev->private;
int i, n; int i, n;
const unsigned int mask = (1 << boardtype.adbits) - 1; const unsigned int mask = (1 << boardtype.adbits) - 1;
unsigned signbits; unsigned signbits;
...@@ -1881,7 +1928,9 @@ static int ni_ai_insn_read(struct comedi_device *dev, ...@@ -1881,7 +1928,9 @@ static int ni_ai_insn_read(struct comedi_device *dev,
static void ni_prime_channelgain_list(struct comedi_device *dev) static void ni_prime_channelgain_list(struct comedi_device *dev)
{ {
struct ni_private *devpriv = dev->private;
int i; int i;
devpriv->stc_writew(dev, AI_CONVERT_Pulse, AI_Command_1_Register); devpriv->stc_writew(dev, AI_CONVERT_Pulse, AI_Command_1_Register);
for (i = 0; i < NI_TIMEOUT; ++i) { for (i = 0; i < NI_TIMEOUT; ++i) {
if (!(devpriv->stc_readw(dev, if (!(devpriv->stc_readw(dev,
...@@ -1899,6 +1948,7 @@ static void ni_m_series_load_channelgain_list(struct comedi_device *dev, ...@@ -1899,6 +1948,7 @@ static void ni_m_series_load_channelgain_list(struct comedi_device *dev,
unsigned int n_chan, unsigned int n_chan,
unsigned int *list) unsigned int *list)
{ {
struct ni_private *devpriv = dev->private;
unsigned int chan, range, aref; unsigned int chan, range, aref;
unsigned int i; unsigned int i;
unsigned offset; unsigned offset;
...@@ -2004,6 +2054,7 @@ static void ni_m_series_load_channelgain_list(struct comedi_device *dev, ...@@ -2004,6 +2054,7 @@ static void ni_m_series_load_channelgain_list(struct comedi_device *dev,
static void ni_load_channelgain_list(struct comedi_device *dev, static void ni_load_channelgain_list(struct comedi_device *dev,
unsigned int n_chan, unsigned int *list) unsigned int n_chan, unsigned int *list)
{ {
struct ni_private *devpriv = dev->private;
unsigned int chan, range, aref; unsigned int chan, range, aref;
unsigned int i; unsigned int i;
unsigned int hi, lo; unsigned int hi, lo;
...@@ -2122,7 +2173,9 @@ static void ni_load_channelgain_list(struct comedi_device *dev, ...@@ -2122,7 +2173,9 @@ static void ni_load_channelgain_list(struct comedi_device *dev,
static int ni_ns_to_timer(const struct comedi_device *dev, unsigned nanosec, static int ni_ns_to_timer(const struct comedi_device *dev, unsigned nanosec,
int round_mode) int round_mode)
{ {
struct ni_private *devpriv = dev->private;
int divider; int divider;
switch (round_mode) { switch (round_mode) {
case TRIG_ROUND_NEAREST: case TRIG_ROUND_NEAREST:
default: default:
...@@ -2140,6 +2193,8 @@ static int ni_ns_to_timer(const struct comedi_device *dev, unsigned nanosec, ...@@ -2140,6 +2193,8 @@ static int ni_ns_to_timer(const struct comedi_device *dev, unsigned nanosec,
static unsigned ni_timer_to_ns(const struct comedi_device *dev, int timer) static unsigned ni_timer_to_ns(const struct comedi_device *dev, int timer)
{ {
struct ni_private *devpriv = dev->private;
return devpriv->clock_ns * (timer + 1); return devpriv->clock_ns * (timer + 1);
} }
...@@ -2162,6 +2217,7 @@ static unsigned ni_min_ai_scan_period_ns(struct comedi_device *dev, ...@@ -2162,6 +2217,7 @@ static unsigned ni_min_ai_scan_period_ns(struct comedi_device *dev,
static int ni_ai_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s, static int ni_ai_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s,
struct comedi_cmd *cmd) struct comedi_cmd *cmd)
{ {
struct ni_private *devpriv = dev->private;
int err = 0; int err = 0;
int tmp; int tmp;
unsigned int sources; unsigned int sources;
...@@ -2356,6 +2412,7 @@ static int ni_ai_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s, ...@@ -2356,6 +2412,7 @@ static int ni_ai_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s,
static int ni_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) static int ni_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
{ {
struct ni_private *devpriv = dev->private;
const struct comedi_cmd *cmd = &s->async->cmd; const struct comedi_cmd *cmd = &s->async->cmd;
int timer; int timer;
int mode1 = 0; /* mode1 is needed for both stop and convert */ int mode1 = 0; /* mode1 is needed for both stop and convert */
...@@ -2662,6 +2719,8 @@ static int ni_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) ...@@ -2662,6 +2719,8 @@ static int ni_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
static int ni_ai_inttrig(struct comedi_device *dev, struct comedi_subdevice *s, static int ni_ai_inttrig(struct comedi_device *dev, struct comedi_subdevice *s,
unsigned int trignum) unsigned int trignum)
{ {
struct ni_private *devpriv = dev->private;
if (trignum != 0) if (trignum != 0)
return -EINVAL; return -EINVAL;
...@@ -2681,6 +2740,8 @@ static int ni_ai_insn_config(struct comedi_device *dev, ...@@ -2681,6 +2740,8 @@ static int ni_ai_insn_config(struct comedi_device *dev,
struct comedi_subdevice *s, struct comedi_subdevice *s,
struct comedi_insn *insn, unsigned int *data) struct comedi_insn *insn, unsigned int *data)
{ {
struct ni_private *devpriv = dev->private;
if (insn->n < 1) if (insn->n < 1)
return -EINVAL; return -EINVAL;
...@@ -2734,6 +2795,7 @@ static int ni_ai_config_analog_trig(struct comedi_device *dev, ...@@ -2734,6 +2795,7 @@ static int ni_ai_config_analog_trig(struct comedi_device *dev,
struct comedi_insn *insn, struct comedi_insn *insn,
unsigned int *data) unsigned int *data)
{ {
struct ni_private *devpriv = dev->private;
unsigned int a, b, modebits; unsigned int a, b, modebits;
int err = 0; int err = 0;
...@@ -2857,6 +2919,7 @@ static int ni_m_series_ao_config_chanlist(struct comedi_device *dev, ...@@ -2857,6 +2919,7 @@ static int ni_m_series_ao_config_chanlist(struct comedi_device *dev,
unsigned int chanspec[], unsigned int chanspec[],
unsigned int n_chans, int timed) unsigned int n_chans, int timed)
{ {
struct ni_private *devpriv = dev->private;
unsigned int range; unsigned int range;
unsigned int chan; unsigned int chan;
unsigned int conf; unsigned int conf;
...@@ -2928,6 +2991,7 @@ static int ni_old_ao_config_chanlist(struct comedi_device *dev, ...@@ -2928,6 +2991,7 @@ static int ni_old_ao_config_chanlist(struct comedi_device *dev,
unsigned int chanspec[], unsigned int chanspec[],
unsigned int n_chans) unsigned int n_chans)
{ {
struct ni_private *devpriv = dev->private;
unsigned int range; unsigned int range;
unsigned int chan; unsigned int chan;
unsigned int conf; unsigned int conf;
...@@ -2984,6 +3048,8 @@ static int ni_ao_insn_read(struct comedi_device *dev, ...@@ -2984,6 +3048,8 @@ static int ni_ao_insn_read(struct comedi_device *dev,
struct comedi_subdevice *s, struct comedi_insn *insn, struct comedi_subdevice *s, struct comedi_insn *insn,
unsigned int *data) unsigned int *data)
{ {
struct ni_private *devpriv = dev->private;
data[0] = devpriv->ao[CR_CHAN(insn->chanspec)]; data[0] = devpriv->ao[CR_CHAN(insn->chanspec)];
return 1; return 1;
...@@ -2993,6 +3059,7 @@ static int ni_ao_insn_write(struct comedi_device *dev, ...@@ -2993,6 +3059,7 @@ static int ni_ao_insn_write(struct comedi_device *dev,
struct comedi_subdevice *s, struct comedi_subdevice *s,
struct comedi_insn *insn, unsigned int *data) struct comedi_insn *insn, unsigned int *data)
{ {
struct ni_private *devpriv = dev->private;
unsigned int chan = CR_CHAN(insn->chanspec); unsigned int chan = CR_CHAN(insn->chanspec);
unsigned int invert; unsigned int invert;
...@@ -3013,6 +3080,7 @@ static int ni_ao_insn_write_671x(struct comedi_device *dev, ...@@ -3013,6 +3080,7 @@ static int ni_ao_insn_write_671x(struct comedi_device *dev,
struct comedi_subdevice *s, struct comedi_subdevice *s,
struct comedi_insn *insn, unsigned int *data) struct comedi_insn *insn, unsigned int *data)
{ {
struct ni_private *devpriv = dev->private;
unsigned int chan = CR_CHAN(insn->chanspec); unsigned int chan = CR_CHAN(insn->chanspec);
unsigned int invert; unsigned int invert;
...@@ -3031,6 +3099,8 @@ static int ni_ao_insn_config(struct comedi_device *dev, ...@@ -3031,6 +3099,8 @@ static int ni_ao_insn_config(struct comedi_device *dev,
struct comedi_subdevice *s, struct comedi_subdevice *s,
struct comedi_insn *insn, unsigned int *data) struct comedi_insn *insn, unsigned int *data)
{ {
struct ni_private *devpriv = dev->private;
switch (data[0]) { switch (data[0]) {
case INSN_CONFIG_GET_HARDWARE_BUFFER_SIZE: case INSN_CONFIG_GET_HARDWARE_BUFFER_SIZE:
switch (data[1]) { switch (data[1]) {
...@@ -3057,6 +3127,7 @@ static int ni_ao_insn_config(struct comedi_device *dev, ...@@ -3057,6 +3127,7 @@ static int ni_ao_insn_config(struct comedi_device *dev,
static int ni_ao_inttrig(struct comedi_device *dev, struct comedi_subdevice *s, static int ni_ao_inttrig(struct comedi_device *dev, struct comedi_subdevice *s,
unsigned int trignum) unsigned int trignum)
{ {
struct ni_private *devpriv = dev->private;
int ret; int ret;
int interrupt_b_bits; int interrupt_b_bits;
int i; int i;
...@@ -3126,6 +3197,7 @@ static int ni_ao_inttrig(struct comedi_device *dev, struct comedi_subdevice *s, ...@@ -3126,6 +3197,7 @@ static int ni_ao_inttrig(struct comedi_device *dev, struct comedi_subdevice *s,
static int ni_ao_cmd(struct comedi_device *dev, struct comedi_subdevice *s) static int ni_ao_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
{ {
struct ni_private *devpriv = dev->private;
const struct comedi_cmd *cmd = &s->async->cmd; const struct comedi_cmd *cmd = &s->async->cmd;
int bits; int bits;
int i; int i;
...@@ -3330,6 +3402,7 @@ static int ni_ao_cmd(struct comedi_device *dev, struct comedi_subdevice *s) ...@@ -3330,6 +3402,7 @@ static int ni_ao_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
static int ni_ao_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s, static int ni_ao_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s,
struct comedi_cmd *cmd) struct comedi_cmd *cmd)
{ {
struct ni_private *devpriv = dev->private;
int err = 0; int err = 0;
int tmp; int tmp;
...@@ -3438,6 +3511,8 @@ static int ni_ao_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s, ...@@ -3438,6 +3511,8 @@ static int ni_ao_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s,
static int ni_ao_reset(struct comedi_device *dev, struct comedi_subdevice *s) static int ni_ao_reset(struct comedi_device *dev, struct comedi_subdevice *s)
{ {
struct ni_private *devpriv = dev->private;
/* devpriv->ao0p=0x0000; */ /* devpriv->ao0p=0x0000; */
/* ni_writew(devpriv->ao0p,AO_Configuration); */ /* ni_writew(devpriv->ao0p,AO_Configuration); */
...@@ -3491,6 +3566,8 @@ static int ni_dio_insn_config(struct comedi_device *dev, ...@@ -3491,6 +3566,8 @@ static int ni_dio_insn_config(struct comedi_device *dev,
struct comedi_subdevice *s, struct comedi_subdevice *s,
struct comedi_insn *insn, unsigned int *data) struct comedi_insn *insn, unsigned int *data)
{ {
struct ni_private *devpriv = dev->private;
#ifdef DEBUG_DIO #ifdef DEBUG_DIO
printk("ni_dio_insn_config() chan=%d io=%d\n", printk("ni_dio_insn_config() chan=%d io=%d\n",
CR_CHAN(insn->chanspec), data[0]); CR_CHAN(insn->chanspec), data[0]);
...@@ -3524,6 +3601,8 @@ static int ni_dio_insn_bits(struct comedi_device *dev, ...@@ -3524,6 +3601,8 @@ static int ni_dio_insn_bits(struct comedi_device *dev,
struct comedi_subdevice *s, struct comedi_subdevice *s,
struct comedi_insn *insn, unsigned int *data) struct comedi_insn *insn, unsigned int *data)
{ {
struct ni_private *devpriv = dev->private;
#ifdef DEBUG_DIO #ifdef DEBUG_DIO
printk("ni_dio_insn_bits() mask=0x%x bits=0x%x\n", data[0], data[1]); printk("ni_dio_insn_bits() mask=0x%x bits=0x%x\n", data[0], data[1]);
#endif #endif
...@@ -3552,6 +3631,8 @@ static int ni_m_series_dio_insn_config(struct comedi_device *dev, ...@@ -3552,6 +3631,8 @@ static int ni_m_series_dio_insn_config(struct comedi_device *dev,
struct comedi_insn *insn, struct comedi_insn *insn,
unsigned int *data) unsigned int *data)
{ {
struct ni_private *devpriv __maybe_unused = dev->private;
#ifdef DEBUG_DIO #ifdef DEBUG_DIO
printk("ni_m_series_dio_insn_config() chan=%d io=%d\n", printk("ni_m_series_dio_insn_config() chan=%d io=%d\n",
CR_CHAN(insn->chanspec), data[0]); CR_CHAN(insn->chanspec), data[0]);
...@@ -3584,6 +3665,8 @@ static int ni_m_series_dio_insn_bits(struct comedi_device *dev, ...@@ -3584,6 +3665,8 @@ static int ni_m_series_dio_insn_bits(struct comedi_device *dev,
struct comedi_insn *insn, struct comedi_insn *insn,
unsigned int *data) unsigned int *data)
{ {
struct ni_private *devpriv __maybe_unused = dev->private;
#ifdef DEBUG_DIO #ifdef DEBUG_DIO
printk("ni_m_series_dio_insn_bits() mask=0x%x bits=0x%x\n", data[0], printk("ni_m_series_dio_insn_bits() mask=0x%x bits=0x%x\n", data[0],
data[1]); data[1]);
...@@ -3680,6 +3763,7 @@ static int ni_cdio_cmdtest(struct comedi_device *dev, ...@@ -3680,6 +3763,7 @@ static int ni_cdio_cmdtest(struct comedi_device *dev,
static int ni_cdio_cmd(struct comedi_device *dev, struct comedi_subdevice *s) static int ni_cdio_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
{ {
struct ni_private *devpriv __maybe_unused = dev->private;
const struct comedi_cmd *cmd = &s->async->cmd; const struct comedi_cmd *cmd = &s->async->cmd;
unsigned cdo_mode_bits = CDO_FIFO_Mode_Bit | CDO_Halt_On_Error_Bit; unsigned cdo_mode_bits = CDO_FIFO_Mode_Bit | CDO_Halt_On_Error_Bit;
int retval; int retval;
...@@ -3719,6 +3803,7 @@ static int ni_cdo_inttrig(struct comedi_device *dev, struct comedi_subdevice *s, ...@@ -3719,6 +3803,7 @@ static int ni_cdo_inttrig(struct comedi_device *dev, struct comedi_subdevice *s,
unsigned int trignum) unsigned int trignum)
{ {
#ifdef PCIDMA #ifdef PCIDMA
struct ni_private *devpriv = dev->private;
unsigned long flags; unsigned long flags;
#endif #endif
int retval = 0; int retval = 0;
...@@ -3766,6 +3851,8 @@ static int ni_cdo_inttrig(struct comedi_device *dev, struct comedi_subdevice *s, ...@@ -3766,6 +3851,8 @@ static int ni_cdo_inttrig(struct comedi_device *dev, struct comedi_subdevice *s,
static int ni_cdio_cancel(struct comedi_device *dev, struct comedi_subdevice *s) static int ni_cdio_cancel(struct comedi_device *dev, struct comedi_subdevice *s)
{ {
struct ni_private *devpriv __maybe_unused = dev->private;
ni_writel(CDO_Disarm_Bit | CDO_Error_Interrupt_Enable_Clear_Bit | ni_writel(CDO_Disarm_Bit | CDO_Error_Interrupt_Enable_Clear_Bit |
CDO_Empty_FIFO_Interrupt_Enable_Clear_Bit | CDO_Empty_FIFO_Interrupt_Enable_Clear_Bit |
CDO_FIFO_Request_Interrupt_Enable_Clear_Bit, CDO_FIFO_Request_Interrupt_Enable_Clear_Bit,
...@@ -3781,6 +3868,7 @@ static int ni_cdio_cancel(struct comedi_device *dev, struct comedi_subdevice *s) ...@@ -3781,6 +3868,7 @@ static int ni_cdio_cancel(struct comedi_device *dev, struct comedi_subdevice *s)
static void handle_cdio_interrupt(struct comedi_device *dev) static void handle_cdio_interrupt(struct comedi_device *dev)
{ {
struct ni_private *devpriv __maybe_unused = dev->private;
unsigned cdio_status; unsigned cdio_status;
struct comedi_subdevice *s = &dev->subdevices[NI_DIO_SUBDEV]; struct comedi_subdevice *s = &dev->subdevices[NI_DIO_SUBDEV];
#ifdef PCIDMA #ifdef PCIDMA
...@@ -3824,6 +3912,7 @@ static int ni_serial_insn_config(struct comedi_device *dev, ...@@ -3824,6 +3912,7 @@ static int ni_serial_insn_config(struct comedi_device *dev,
struct comedi_subdevice *s, struct comedi_subdevice *s,
struct comedi_insn *insn, unsigned int *data) struct comedi_insn *insn, unsigned int *data)
{ {
struct ni_private *devpriv = dev->private;
int err = insn->n; int err = insn->n;
unsigned char byte_out, byte_in = 0; unsigned char byte_out, byte_in = 0;
...@@ -3920,6 +4009,7 @@ static int ni_serial_hw_readwrite8(struct comedi_device *dev, ...@@ -3920,6 +4009,7 @@ static int ni_serial_hw_readwrite8(struct comedi_device *dev,
unsigned char data_out, unsigned char data_out,
unsigned char *data_in) unsigned char *data_in)
{ {
struct ni_private *devpriv = dev->private;
unsigned int status1; unsigned int status1;
int err = 0, count = 20; int err = 0, count = 20;
...@@ -3978,6 +4068,7 @@ static int ni_serial_sw_readwrite8(struct comedi_device *dev, ...@@ -3978,6 +4068,7 @@ static int ni_serial_sw_readwrite8(struct comedi_device *dev,
unsigned char data_out, unsigned char data_out,
unsigned char *data_in) unsigned char *data_in)
{ {
struct ni_private *devpriv = dev->private;
unsigned char mask, input = 0; unsigned char mask, input = 0;
#ifdef DEBUG_DIO #ifdef DEBUG_DIO
...@@ -4031,9 +4122,10 @@ static int ni_serial_sw_readwrite8(struct comedi_device *dev, ...@@ -4031,9 +4122,10 @@ static int ni_serial_sw_readwrite8(struct comedi_device *dev,
static void mio_common_detach(struct comedi_device *dev) static void mio_common_detach(struct comedi_device *dev)
{ {
struct ni_private *devpriv = dev->private;
struct comedi_subdevice *s; struct comedi_subdevice *s;
if (dev->private) { if (devpriv) {
if (devpriv->counter_dev) { if (devpriv->counter_dev) {
ni_gpct_device_destroy(devpriv->counter_dev); ni_gpct_device_destroy(devpriv->counter_dev);
} }
...@@ -4151,6 +4243,7 @@ static void ni_gpct_write_register(struct ni_gpct *counter, unsigned bits, ...@@ -4151,6 +4243,7 @@ static void ni_gpct_write_register(struct ni_gpct *counter, unsigned bits,
enum ni_gpct_register reg) enum ni_gpct_register reg)
{ {
struct comedi_device *dev = counter->counter_dev->dev; struct comedi_device *dev = counter->counter_dev->dev;
struct ni_private *devpriv = dev->private;
unsigned stc_register; unsigned stc_register;
/* bits in the join reset register which are relevant to counters */ /* bits in the join reset register which are relevant to counters */
static const unsigned gpct_joint_reset_mask = G0_Reset | G1_Reset; static const unsigned gpct_joint_reset_mask = G0_Reset | G1_Reset;
...@@ -4219,7 +4312,9 @@ static unsigned ni_gpct_read_register(struct ni_gpct *counter, ...@@ -4219,7 +4312,9 @@ static unsigned ni_gpct_read_register(struct ni_gpct *counter,
enum ni_gpct_register reg) enum ni_gpct_register reg)
{ {
struct comedi_device *dev = counter->counter_dev->dev; struct comedi_device *dev = counter->counter_dev->dev;
struct ni_private *devpriv = dev->private;
unsigned stc_register; unsigned stc_register;
switch (reg) { switch (reg) {
/* m-series only registers */ /* m-series only registers */
case NITIO_G0_DMA_Status_Reg: case NITIO_G0_DMA_Status_Reg:
...@@ -4251,6 +4346,8 @@ static int ni_freq_out_insn_read(struct comedi_device *dev, ...@@ -4251,6 +4346,8 @@ static int ni_freq_out_insn_read(struct comedi_device *dev,
struct comedi_subdevice *s, struct comedi_subdevice *s,
struct comedi_insn *insn, unsigned int *data) struct comedi_insn *insn, unsigned int *data)
{ {
struct ni_private *devpriv = dev->private;
data[0] = devpriv->clock_and_fout & FOUT_Divider_mask; data[0] = devpriv->clock_and_fout & FOUT_Divider_mask;
return 1; return 1;
} }
...@@ -4259,6 +4356,8 @@ static int ni_freq_out_insn_write(struct comedi_device *dev, ...@@ -4259,6 +4356,8 @@ static int ni_freq_out_insn_write(struct comedi_device *dev,
struct comedi_subdevice *s, struct comedi_subdevice *s,
struct comedi_insn *insn, unsigned int *data) struct comedi_insn *insn, unsigned int *data)
{ {
struct ni_private *devpriv = dev->private;
devpriv->clock_and_fout &= ~FOUT_Enable; devpriv->clock_and_fout &= ~FOUT_Enable;
devpriv->stc_writew(dev, devpriv->clock_and_fout, devpriv->stc_writew(dev, devpriv->clock_and_fout,
Clock_and_FOUT_Register); Clock_and_FOUT_Register);
...@@ -4273,6 +4372,8 @@ static int ni_freq_out_insn_write(struct comedi_device *dev, ...@@ -4273,6 +4372,8 @@ static int ni_freq_out_insn_write(struct comedi_device *dev,
static int ni_set_freq_out_clock(struct comedi_device *dev, static int ni_set_freq_out_clock(struct comedi_device *dev,
unsigned int clock_source) unsigned int clock_source)
{ {
struct ni_private *devpriv = dev->private;
switch (clock_source) { switch (clock_source) {
case NI_FREQ_OUT_TIMEBASE_1_DIV_2_CLOCK_SRC: case NI_FREQ_OUT_TIMEBASE_1_DIV_2_CLOCK_SRC:
devpriv->clock_and_fout &= ~FOUT_Timebase_Select; devpriv->clock_and_fout &= ~FOUT_Timebase_Select;
...@@ -4292,6 +4393,8 @@ static void ni_get_freq_out_clock(struct comedi_device *dev, ...@@ -4292,6 +4393,8 @@ static void ni_get_freq_out_clock(struct comedi_device *dev,
unsigned int *clock_source, unsigned int *clock_source,
unsigned int *clock_period_ns) unsigned int *clock_period_ns)
{ {
struct ni_private *devpriv = dev->private;
if (devpriv->clock_and_fout & FOUT_Timebase_Select) { if (devpriv->clock_and_fout & FOUT_Timebase_Select) {
*clock_source = NI_FREQ_OUT_TIMEBASE_2_CLOCK_SRC; *clock_source = NI_FREQ_OUT_TIMEBASE_2_CLOCK_SRC;
*clock_period_ns = TIMEBASE_2_NS; *clock_period_ns = TIMEBASE_2_NS;
...@@ -4320,11 +4423,13 @@ static int ni_freq_out_insn_config(struct comedi_device *dev, ...@@ -4320,11 +4423,13 @@ static int ni_freq_out_insn_config(struct comedi_device *dev,
static int ni_alloc_private(struct comedi_device *dev) static int ni_alloc_private(struct comedi_device *dev)
{ {
struct ni_private *devpriv;
int ret; int ret;
ret = alloc_private(dev, sizeof(struct ni_private)); ret = alloc_private(dev, sizeof(*devpriv));
if (ret < 0) if (ret)
return ret; return ret;
devpriv = dev->private;
spin_lock_init(&devpriv->window_lock); spin_lock_init(&devpriv->window_lock);
spin_lock_init(&devpriv->soft_reg_copy_lock); spin_lock_init(&devpriv->soft_reg_copy_lock);
...@@ -4335,6 +4440,7 @@ static int ni_alloc_private(struct comedi_device *dev) ...@@ -4335,6 +4440,7 @@ static int ni_alloc_private(struct comedi_device *dev)
static int ni_E_init(struct comedi_device *dev) static int ni_E_init(struct comedi_device *dev)
{ {
struct ni_private *devpriv = dev->private;
struct comedi_subdevice *s; struct comedi_subdevice *s;
unsigned j; unsigned j;
enum ni_gpct_variant counter_variant; enum ni_gpct_variant counter_variant;
...@@ -4661,6 +4767,7 @@ static int ni_E_init(struct comedi_device *dev) ...@@ -4661,6 +4767,7 @@ static int ni_E_init(struct comedi_device *dev)
static int ni_8255_callback(int dir, int port, int data, unsigned long arg) static int ni_8255_callback(int dir, int port, int data, unsigned long arg)
{ {
struct comedi_device *dev = (struct comedi_device *)arg; struct comedi_device *dev = (struct comedi_device *)arg;
struct ni_private *devpriv __maybe_unused = dev->private;
if (dir) { if (dir) {
ni_writeb(data, Port_A + 2 * port); ni_writeb(data, Port_A + 2 * port);
...@@ -4689,6 +4796,7 @@ static int ni_eeprom_insn_read(struct comedi_device *dev, ...@@ -4689,6 +4796,7 @@ static int ni_eeprom_insn_read(struct comedi_device *dev,
static int ni_read_eeprom(struct comedi_device *dev, int addr) static int ni_read_eeprom(struct comedi_device *dev, int addr)
{ {
struct ni_private *devpriv __maybe_unused = dev->private;
int bit; int bit;
int bitstring; int bitstring;
...@@ -4716,6 +4824,8 @@ static int ni_m_series_eeprom_insn_read(struct comedi_device *dev, ...@@ -4716,6 +4824,8 @@ static int ni_m_series_eeprom_insn_read(struct comedi_device *dev,
struct comedi_insn *insn, struct comedi_insn *insn,
unsigned int *data) unsigned int *data)
{ {
struct ni_private *devpriv = dev->private;
data[0] = devpriv->eeprom_buffer[CR_CHAN(insn->chanspec)]; data[0] = devpriv->eeprom_buffer[CR_CHAN(insn->chanspec)];
return 1; return 1;
...@@ -4723,6 +4833,8 @@ static int ni_m_series_eeprom_insn_read(struct comedi_device *dev, ...@@ -4723,6 +4833,8 @@ static int ni_m_series_eeprom_insn_read(struct comedi_device *dev,
static int ni_get_pwm_config(struct comedi_device *dev, unsigned int *data) static int ni_get_pwm_config(struct comedi_device *dev, unsigned int *data)
{ {
struct ni_private *devpriv = dev->private;
data[1] = devpriv->pwm_up_count * devpriv->clock_ns; data[1] = devpriv->pwm_up_count * devpriv->clock_ns;
data[2] = devpriv->pwm_down_count * devpriv->clock_ns; data[2] = devpriv->pwm_down_count * devpriv->clock_ns;
return 3; return 3;
...@@ -4732,7 +4844,9 @@ static int ni_m_series_pwm_config(struct comedi_device *dev, ...@@ -4732,7 +4844,9 @@ static int ni_m_series_pwm_config(struct comedi_device *dev,
struct comedi_subdevice *s, struct comedi_subdevice *s,
struct comedi_insn *insn, unsigned int *data) struct comedi_insn *insn, unsigned int *data)
{ {
struct ni_private *devpriv = dev->private;
unsigned up_count, down_count; unsigned up_count, down_count;
switch (data[0]) { switch (data[0]) {
case INSN_CONFIG_PWM_OUTPUT: case INSN_CONFIG_PWM_OUTPUT:
switch (data[1]) { switch (data[1]) {
...@@ -4798,7 +4912,9 @@ static int ni_6143_pwm_config(struct comedi_device *dev, ...@@ -4798,7 +4912,9 @@ static int ni_6143_pwm_config(struct comedi_device *dev,
struct comedi_subdevice *s, struct comedi_subdevice *s,
struct comedi_insn *insn, unsigned int *data) struct comedi_insn *insn, unsigned int *data)
{ {
struct ni_private *devpriv = dev->private;
unsigned up_count, down_count; unsigned up_count, down_count;
switch (data[0]) { switch (data[0]) {
case INSN_CONFIG_PWM_OUTPUT: case INSN_CONFIG_PWM_OUTPUT:
switch (data[1]) { switch (data[1]) {
...@@ -4875,6 +4991,8 @@ static int ni_calib_insn_read(struct comedi_device *dev, ...@@ -4875,6 +4991,8 @@ static int ni_calib_insn_read(struct comedi_device *dev,
struct comedi_subdevice *s, struct comedi_subdevice *s,
struct comedi_insn *insn, unsigned int *data) struct comedi_insn *insn, unsigned int *data)
{ {
struct ni_private *devpriv = dev->private;
data[0] = devpriv->caldacs[CR_CHAN(insn->chanspec)]; data[0] = devpriv->caldacs[CR_CHAN(insn->chanspec)];
return 1; return 1;
...@@ -4905,6 +5023,7 @@ static struct caldac_struct caldacs[] = { ...@@ -4905,6 +5023,7 @@ static struct caldac_struct caldacs[] = {
static void caldac_setup(struct comedi_device *dev, struct comedi_subdevice *s) static void caldac_setup(struct comedi_device *dev, struct comedi_subdevice *s)
{ {
struct ni_private *devpriv = dev->private;
int i, j; int i, j;
int n_dacs; int n_dacs;
int n_chans = 0; int n_chans = 0;
...@@ -4958,6 +5077,7 @@ static void caldac_setup(struct comedi_device *dev, struct comedi_subdevice *s) ...@@ -4958,6 +5077,7 @@ static void caldac_setup(struct comedi_device *dev, struct comedi_subdevice *s)
static void ni_write_caldac(struct comedi_device *dev, int addr, int val) static void ni_write_caldac(struct comedi_device *dev, int addr, int val)
{ {
struct ni_private *devpriv = dev->private;
unsigned int loadbit = 0, bits = 0, bit, bitstring = 0; unsigned int loadbit = 0, bits = 0, bit, bitstring = 0;
int i; int i;
int type; int type;
...@@ -5211,8 +5331,10 @@ static int ni_gpct_cancel(struct comedi_device *dev, struct comedi_subdevice *s) ...@@ -5211,8 +5331,10 @@ static int ni_gpct_cancel(struct comedi_device *dev, struct comedi_subdevice *s)
static int ni_m_series_set_pfi_routing(struct comedi_device *dev, unsigned chan, static int ni_m_series_set_pfi_routing(struct comedi_device *dev, unsigned chan,
unsigned source) unsigned source)
{ {
struct ni_private *devpriv = dev->private;
unsigned pfi_reg_index; unsigned pfi_reg_index;
unsigned array_offset; unsigned array_offset;
if ((source & 0x1f) != source) if ((source & 0x1f) != source)
return -EINVAL; return -EINVAL;
pfi_reg_index = 1 + chan / 3; pfi_reg_index = 1 + chan / 3;
...@@ -5247,7 +5369,9 @@ static int ni_set_pfi_routing(struct comedi_device *dev, unsigned chan, ...@@ -5247,7 +5369,9 @@ static int ni_set_pfi_routing(struct comedi_device *dev, unsigned chan,
static unsigned ni_m_series_get_pfi_routing(struct comedi_device *dev, static unsigned ni_m_series_get_pfi_routing(struct comedi_device *dev,
unsigned chan) unsigned chan)
{ {
struct ni_private *devpriv = dev->private;
const unsigned array_offset = chan / 3; const unsigned array_offset = chan / 3;
return MSeries_PFI_Output_Select_Source(chan, return MSeries_PFI_Output_Select_Source(chan,
devpriv-> devpriv->
pfi_output_select_reg pfi_output_select_reg
...@@ -5306,7 +5430,9 @@ static unsigned ni_get_pfi_routing(struct comedi_device *dev, unsigned chan) ...@@ -5306,7 +5430,9 @@ static unsigned ni_get_pfi_routing(struct comedi_device *dev, unsigned chan)
static int ni_config_filter(struct comedi_device *dev, unsigned pfi_channel, static int ni_config_filter(struct comedi_device *dev, unsigned pfi_channel,
enum ni_pfi_filter_select filter) enum ni_pfi_filter_select filter)
{ {
struct ni_private *devpriv __maybe_unused = dev->private;
unsigned bits; unsigned bits;
if ((boardtype.reg_type & ni_reg_m_series_mask) == 0) { if ((boardtype.reg_type & ni_reg_m_series_mask) == 0) {
return -ENOTSUPP; return -ENOTSUPP;
} }
...@@ -5321,6 +5447,8 @@ static int ni_pfi_insn_bits(struct comedi_device *dev, ...@@ -5321,6 +5447,8 @@ static int ni_pfi_insn_bits(struct comedi_device *dev,
struct comedi_subdevice *s, struct comedi_subdevice *s,
struct comedi_insn *insn, unsigned int *data) struct comedi_insn *insn, unsigned int *data)
{ {
struct ni_private *devpriv __maybe_unused = dev->private;
if ((boardtype.reg_type & ni_reg_m_series_mask) == 0) { if ((boardtype.reg_type & ni_reg_m_series_mask) == 0) {
return -ENOTSUPP; return -ENOTSUPP;
} }
...@@ -5337,6 +5465,7 @@ static int ni_pfi_insn_config(struct comedi_device *dev, ...@@ -5337,6 +5465,7 @@ static int ni_pfi_insn_config(struct comedi_device *dev,
struct comedi_subdevice *s, struct comedi_subdevice *s,
struct comedi_insn *insn, unsigned int *data) struct comedi_insn *insn, unsigned int *data)
{ {
struct ni_private *devpriv = dev->private;
unsigned int chan; unsigned int chan;
if (insn->n < 1) if (insn->n < 1)
...@@ -5379,6 +5508,8 @@ static int ni_pfi_insn_config(struct comedi_device *dev, ...@@ -5379,6 +5508,8 @@ static int ni_pfi_insn_config(struct comedi_device *dev,
*/ */
static void ni_rtsi_init(struct comedi_device *dev) static void ni_rtsi_init(struct comedi_device *dev)
{ {
struct ni_private *devpriv = dev->private;
/* Initialises the RTSI bus signal switch to a default state */ /* Initialises the RTSI bus signal switch to a default state */
/* Set clock mode to internal */ /* Set clock mode to internal */
...@@ -5480,6 +5611,7 @@ static inline unsigned num_configurable_rtsi_channels(struct comedi_device *dev) ...@@ -5480,6 +5611,7 @@ static inline unsigned num_configurable_rtsi_channels(struct comedi_device *dev)
static int ni_mseries_set_pll_master_clock(struct comedi_device *dev, static int ni_mseries_set_pll_master_clock(struct comedi_device *dev,
unsigned source, unsigned period_ns) unsigned source, unsigned period_ns)
{ {
struct ni_private *devpriv = dev->private;
static const unsigned min_period_ns = 50; static const unsigned min_period_ns = 50;
static const unsigned max_period_ns = 1000; static const unsigned max_period_ns = 1000;
static const unsigned timeout = 1000; static const unsigned timeout = 1000;
...@@ -5488,6 +5620,7 @@ static int ni_mseries_set_pll_master_clock(struct comedi_device *dev, ...@@ -5488,6 +5620,7 @@ static int ni_mseries_set_pll_master_clock(struct comedi_device *dev,
unsigned freq_multiplier; unsigned freq_multiplier;
unsigned i; unsigned i;
int retval; int retval;
if (source == NI_MIO_PLL_PXI10_CLOCK) if (source == NI_MIO_PLL_PXI10_CLOCK)
period_ns = 100; period_ns = 100;
/* these limits are somewhat arbitrary, but NI advertises 1 to 20MHz range so we'll use that */ /* these limits are somewhat arbitrary, but NI advertises 1 to 20MHz range so we'll use that */
...@@ -5581,6 +5714,8 @@ static int ni_mseries_set_pll_master_clock(struct comedi_device *dev, ...@@ -5581,6 +5714,8 @@ static int ni_mseries_set_pll_master_clock(struct comedi_device *dev,
static int ni_set_master_clock(struct comedi_device *dev, unsigned source, static int ni_set_master_clock(struct comedi_device *dev, unsigned source,
unsigned period_ns) unsigned period_ns)
{ {
struct ni_private *devpriv = dev->private;
if (source == NI_MIO_INTERNAL_CLOCK) { if (source == NI_MIO_INTERNAL_CLOCK) {
devpriv->rtsi_trig_direction_reg &= ~Use_RTSI_Clock_Bit; devpriv->rtsi_trig_direction_reg &= ~Use_RTSI_Clock_Bit;
devpriv->stc_writew(dev, devpriv->rtsi_trig_direction_reg, devpriv->stc_writew(dev, devpriv->rtsi_trig_direction_reg,
...@@ -5666,6 +5801,8 @@ static int ni_valid_rtsi_output_source(struct comedi_device *dev, unsigned chan, ...@@ -5666,6 +5801,8 @@ static int ni_valid_rtsi_output_source(struct comedi_device *dev, unsigned chan,
static int ni_set_rtsi_routing(struct comedi_device *dev, unsigned chan, static int ni_set_rtsi_routing(struct comedi_device *dev, unsigned chan,
unsigned source) unsigned source)
{ {
struct ni_private *devpriv = dev->private;
if (ni_valid_rtsi_output_source(dev, chan, source) == 0) if (ni_valid_rtsi_output_source(dev, chan, source) == 0)
return -EINVAL; return -EINVAL;
if (chan < 4) { if (chan < 4) {
...@@ -5686,6 +5823,8 @@ static int ni_set_rtsi_routing(struct comedi_device *dev, unsigned chan, ...@@ -5686,6 +5823,8 @@ static int ni_set_rtsi_routing(struct comedi_device *dev, unsigned chan,
static unsigned ni_get_rtsi_routing(struct comedi_device *dev, unsigned chan) static unsigned ni_get_rtsi_routing(struct comedi_device *dev, unsigned chan)
{ {
struct ni_private *devpriv = dev->private;
if (chan < 4) { if (chan < 4) {
return RTSI_Trig_Output_Source(chan, return RTSI_Trig_Output_Source(chan,
devpriv->rtsi_trig_a_output_reg); devpriv->rtsi_trig_a_output_reg);
...@@ -5704,7 +5843,9 @@ static int ni_rtsi_insn_config(struct comedi_device *dev, ...@@ -5704,7 +5843,9 @@ static int ni_rtsi_insn_config(struct comedi_device *dev,
struct comedi_subdevice *s, struct comedi_subdevice *s,
struct comedi_insn *insn, unsigned int *data) struct comedi_insn *insn, unsigned int *data)
{ {
struct ni_private *devpriv = dev->private;
unsigned int chan = CR_CHAN(insn->chanspec); unsigned int chan = CR_CHAN(insn->chanspec);
switch (data[0]) { switch (data[0]) {
case INSN_CONFIG_DIO_OUTPUT: case INSN_CONFIG_DIO_OUTPUT:
if (chan < num_configurable_rtsi_channels(dev)) { if (chan < num_configurable_rtsi_channels(dev)) {
......
drivers/staging/comedi/drivers/ni_mio_cs.c
View file @ 0e05c552
...@@ -177,8 +177,6 @@ struct ni_private { ...@@ -177,8 +177,6 @@ struct ni_private {
NI_PRIVATE_COMMON}; NI_PRIVATE_COMMON};
#define devpriv ((struct ni_private *)dev->private)
/* How we access registers */ /* How we access registers */
#define ni_writel(a, b) (outl((a), (b)+dev->iobase)) #define ni_writel(a, b) (outl((a), (b)+dev->iobase))
...@@ -196,6 +194,7 @@ struct ni_private { ...@@ -196,6 +194,7 @@ struct ni_private {
static void mio_cs_win_out(struct comedi_device *dev, uint16_t data, int addr) static void mio_cs_win_out(struct comedi_device *dev, uint16_t data, int addr)
{ {
struct ni_private *devpriv = dev->private;
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&devpriv->window_lock, flags); spin_lock_irqsave(&devpriv->window_lock, flags);
...@@ -210,6 +209,7 @@ static void mio_cs_win_out(struct comedi_device *dev, uint16_t data, int addr) ...@@ -210,6 +209,7 @@ static void mio_cs_win_out(struct comedi_device *dev, uint16_t data, int addr)
static uint16_t mio_cs_win_in(struct comedi_device *dev, int addr) static uint16_t mio_cs_win_in(struct comedi_device *dev, int addr)
{ {
struct ni_private *devpriv = dev->private;
unsigned long flags; unsigned long flags;
uint16_t ret; uint16_t ret;
...@@ -324,6 +324,7 @@ static void mio_cs_config(struct pcmcia_device *link) ...@@ -324,6 +324,7 @@ static void mio_cs_config(struct pcmcia_device *link)
static int mio_cs_attach(struct comedi_device *dev, struct comedi_devconfig *it) static int mio_cs_attach(struct comedi_device *dev, struct comedi_devconfig *it)
{ {
struct ni_private *devpriv;
struct pcmcia_device *link; struct pcmcia_device *link;
unsigned int irq; unsigned int irq;
int ret; int ret;
...@@ -372,10 +373,10 @@ static int mio_cs_attach(struct comedi_device *dev, struct comedi_devconfig *it) ...@@ -372,10 +373,10 @@ static int mio_cs_attach(struct comedi_device *dev, struct comedi_devconfig *it)
} }
dev->irq = irq; dev->irq = irq;
/* allocate private area */
ret = ni_alloc_private(dev); ret = ni_alloc_private(dev);
if (ret < 0) if (ret)
return ret; return ret;
devpriv = dev->private;
devpriv->stc_writew = &mio_cs_win_out; devpriv->stc_writew = &mio_cs_win_out;
devpriv->stc_readw = &mio_cs_win_in; devpriv->stc_readw = &mio_cs_win_in;
......
drivers/staging/comedi/drivers/ni_pcimio.c
View file @ 0e05c552
...@@ -1190,7 +1190,6 @@ static const struct ni_board_struct ni_boards[] = { ...@@ -1190,7 +1190,6 @@ static const struct ni_board_struct ni_boards[] = {
struct ni_private { struct ni_private {
NI_PRIVATE_COMMON}; NI_PRIVATE_COMMON};
#define devpriv ((struct ni_private *)dev->private)
/* How we access registers */ /* How we access registers */
...@@ -1213,6 +1212,7 @@ NI_PRIVATE_COMMON}; ...@@ -1213,6 +1212,7 @@ NI_PRIVATE_COMMON};
static void e_series_win_out(struct comedi_device *dev, uint16_t data, int reg) static void e_series_win_out(struct comedi_device *dev, uint16_t data, int reg)
{ {
struct ni_private *devpriv = dev->private;
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&devpriv->window_lock, flags); spin_lock_irqsave(&devpriv->window_lock, flags);
...@@ -1223,6 +1223,7 @@ static void e_series_win_out(struct comedi_device *dev, uint16_t data, int reg) ...@@ -1223,6 +1223,7 @@ static void e_series_win_out(struct comedi_device *dev, uint16_t data, int reg)
static uint16_t e_series_win_in(struct comedi_device *dev, int reg) static uint16_t e_series_win_in(struct comedi_device *dev, int reg)
{ {
struct ni_private *devpriv = dev->private;
unsigned long flags; unsigned long flags;
uint16_t ret; uint16_t ret;
...@@ -1237,7 +1238,9 @@ static uint16_t e_series_win_in(struct comedi_device *dev, int reg) ...@@ -1237,7 +1238,9 @@ static uint16_t e_series_win_in(struct comedi_device *dev, int reg)
static void m_series_stc_writew(struct comedi_device *dev, uint16_t data, static void m_series_stc_writew(struct comedi_device *dev, uint16_t data,
int reg) int reg)
{ {
struct ni_private *devpriv = dev->private;
unsigned offset; unsigned offset;
switch (reg) { switch (reg) {
case ADC_FIFO_Clear: case ADC_FIFO_Clear:
offset = M_Offset_AI_FIFO_Clear; offset = M_Offset_AI_FIFO_Clear;
...@@ -1392,7 +1395,9 @@ static void m_series_stc_writew(struct comedi_device *dev, uint16_t data, ...@@ -1392,7 +1395,9 @@ static void m_series_stc_writew(struct comedi_device *dev, uint16_t data,
static uint16_t m_series_stc_readw(struct comedi_device *dev, int reg) static uint16_t m_series_stc_readw(struct comedi_device *dev, int reg)
{ {
struct ni_private *devpriv = dev->private;
unsigned offset; unsigned offset;
switch (reg) { switch (reg) {
case AI_Status_1_Register: case AI_Status_1_Register:
offset = M_Offset_AI_Status_1; offset = M_Offset_AI_Status_1;
...@@ -1428,7 +1433,9 @@ static uint16_t m_series_stc_readw(struct comedi_device *dev, int reg) ...@@ -1428,7 +1433,9 @@ static uint16_t m_series_stc_readw(struct comedi_device *dev, int reg)
static void m_series_stc_writel(struct comedi_device *dev, uint32_t data, static void m_series_stc_writel(struct comedi_device *dev, uint32_t data,
int reg) int reg)
{ {
struct ni_private *devpriv = dev->private;
unsigned offset; unsigned offset;
switch (reg) { switch (reg) {
case AI_SC_Load_A_Registers: case AI_SC_Load_A_Registers:
offset = M_Offset_AI_SC_Load_A; offset = M_Offset_AI_SC_Load_A;
...@@ -1469,7 +1476,9 @@ static void m_series_stc_writel(struct comedi_device *dev, uint32_t data, ...@@ -1469,7 +1476,9 @@ static void m_series_stc_writel(struct comedi_device *dev, uint32_t data,
static uint32_t m_series_stc_readl(struct comedi_device *dev, int reg) static uint32_t m_series_stc_readl(struct comedi_device *dev, int reg)
{ {
struct ni_private *devpriv = dev->private;
unsigned offset; unsigned offset;
switch (reg) { switch (reg) {
case G_HW_Save_Register(0): case G_HW_Save_Register(0):
offset = M_Offset_G0_HW_Save; offset = M_Offset_G0_HW_Save;
...@@ -1516,6 +1525,7 @@ static int pcimio_dio_change(struct comedi_device *dev, ...@@ -1516,6 +1525,7 @@ static int pcimio_dio_change(struct comedi_device *dev,
static void m_series_init_eeprom_buffer(struct comedi_device *dev) static void m_series_init_eeprom_buffer(struct comedi_device *dev)
{ {
struct ni_private *devpriv = dev->private;
static const int Start_Cal_EEPROM = 0x400; static const int Start_Cal_EEPROM = 0x400;
static const unsigned window_size = 10; static const unsigned window_size = 10;
static const int serial_number_eeprom_offset = 0x4; static const int serial_number_eeprom_offset = 0x4;
...@@ -1553,6 +1563,8 @@ static void m_series_init_eeprom_buffer(struct comedi_device *dev) ...@@ -1553,6 +1563,8 @@ static void m_series_init_eeprom_buffer(struct comedi_device *dev)
static void init_6143(struct comedi_device *dev) static void init_6143(struct comedi_device *dev)
{ {
struct ni_private *devpriv = dev->private;
/* Disable interrupts */ /* Disable interrupts */
devpriv->stc_writew(dev, 0, Interrupt_Control_Register); devpriv->stc_writew(dev, 0, Interrupt_Control_Register);
...@@ -1572,10 +1584,12 @@ static void init_6143(struct comedi_device *dev) ...@@ -1572,10 +1584,12 @@ static void init_6143(struct comedi_device *dev)
static void pcimio_detach(struct comedi_device *dev) static void pcimio_detach(struct comedi_device *dev)
{ {
struct ni_private *devpriv = dev->private;
mio_common_detach(dev); mio_common_detach(dev);
if (dev->irq) if (dev->irq)
free_irq(dev->irq, dev); free_irq(dev->irq, dev);
if (dev->private) { if (devpriv) {
mite_free_ring(devpriv->ai_mite_ring); mite_free_ring(devpriv->ai_mite_ring);
mite_free_ring(devpriv->ao_mite_ring); mite_free_ring(devpriv->ao_mite_ring);
mite_free_ring(devpriv->cdo_mite_ring); mite_free_ring(devpriv->cdo_mite_ring);
...@@ -1605,13 +1619,15 @@ pcimio_find_boardinfo(struct pci_dev *pcidev) ...@@ -1605,13 +1619,15 @@ pcimio_find_boardinfo(struct pci_dev *pcidev)
static int __devinit pcimio_attach_pci(struct comedi_device *dev, static int __devinit pcimio_attach_pci(struct comedi_device *dev,
struct pci_dev *pcidev) struct pci_dev *pcidev)
{ {
struct ni_private *devpriv;
int ret; int ret;
dev_info(dev->class_dev, "ni_pcimio: attach %s\n", pci_name(pcidev)); dev_info(dev->class_dev, "ni_pcimio: attach %s\n", pci_name(pcidev));
ret = ni_alloc_private(dev); ret = ni_alloc_private(dev);
if (ret < 0) if (ret)
return ret; return ret;
devpriv = dev->private;
dev->board_ptr = pcimio_find_boardinfo(pcidev); dev->board_ptr = pcimio_find_boardinfo(pcidev);
if (!dev->board_ptr) if (!dev->board_ptr)
...@@ -1693,6 +1709,7 @@ static int __devinit pcimio_attach_pci(struct comedi_device *dev, ...@@ -1693,6 +1709,7 @@ static int __devinit pcimio_attach_pci(struct comedi_device *dev,
static int pcimio_ai_change(struct comedi_device *dev, static int pcimio_ai_change(struct comedi_device *dev,
struct comedi_subdevice *s, unsigned long new_size) struct comedi_subdevice *s, unsigned long new_size)
{ {
struct ni_private *devpriv = dev->private;
int ret; int ret;
ret = mite_buf_change(devpriv->ai_mite_ring, s->async); ret = mite_buf_change(devpriv->ai_mite_ring, s->async);
...@@ -1705,6 +1722,7 @@ static int pcimio_ai_change(struct comedi_device *dev, ...@@ -1705,6 +1722,7 @@ static int pcimio_ai_change(struct comedi_device *dev,
static int pcimio_ao_change(struct comedi_device *dev, static int pcimio_ao_change(struct comedi_device *dev,
struct comedi_subdevice *s, unsigned long new_size) struct comedi_subdevice *s, unsigned long new_size)
{ {
struct ni_private *devpriv = dev->private;
int ret; int ret;
ret = mite_buf_change(devpriv->ao_mite_ring, s->async); ret = mite_buf_change(devpriv->ao_mite_ring, s->async);
...@@ -1718,6 +1736,7 @@ static int pcimio_gpct0_change(struct comedi_device *dev, ...@@ -1718,6 +1736,7 @@ static int pcimio_gpct0_change(struct comedi_device *dev,
struct comedi_subdevice *s, struct comedi_subdevice *s,
unsigned long new_size) unsigned long new_size)
{ {
struct ni_private *devpriv = dev->private;
int ret; int ret;
ret = mite_buf_change(devpriv->gpct_mite_ring[0], s->async); ret = mite_buf_change(devpriv->gpct_mite_ring[0], s->async);
...@@ -1731,6 +1750,7 @@ static int pcimio_gpct1_change(struct comedi_device *dev, ...@@ -1731,6 +1750,7 @@ static int pcimio_gpct1_change(struct comedi_device *dev,
struct comedi_subdevice *s, struct comedi_subdevice *s,
unsigned long new_size) unsigned long new_size)
{ {
struct ni_private *devpriv = dev->private;
int ret; int ret;
ret = mite_buf_change(devpriv->gpct_mite_ring[1], s->async); ret = mite_buf_change(devpriv->gpct_mite_ring[1], s->async);
...@@ -1743,6 +1763,7 @@ static int pcimio_gpct1_change(struct comedi_device *dev, ...@@ -1743,6 +1763,7 @@ static int pcimio_gpct1_change(struct comedi_device *dev,
static int pcimio_dio_change(struct comedi_device *dev, static int pcimio_dio_change(struct comedi_device *dev,
struct comedi_subdevice *s, unsigned long new_size) struct comedi_subdevice *s, unsigned long new_size)
{ {
struct ni_private *devpriv = dev->private;
int ret; int ret;
ret = mite_buf_change(devpriv->cdo_mite_ring, s->async); ret = mite_buf_change(devpriv->cdo_mite_ring, s->async);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7