Skip to content

Commit

Permalink
staging: comedi: daqboard2000: remove this_board and devpriv macros
Browse files Browse the repository at this point in the history 
These macros rely on a local variable having a specific name.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Sep 19, 2012
1 parent f657b14 commit ad375f7
Showing 1 changed file with 24 additions and 6 deletions.
30 changes: 24 additions & 6 deletions drivers/staging/comedi/drivers/daqboard2000.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -294,8 +294,6 @@ static const struct daq200_boardtype boardtypes[] = {
{"ids4", DAQBOARD2000_SUBSYSTEM_IDS4},
};

#define this_board ((const struct daq200_boardtype *)dev->board_ptr)

struct daqboard2000_private {
enum {
card_daqboard_2000
Expand All @@ -305,10 +303,10 @@ struct daqboard2000_private {
unsigned int ao_readback[2];
};

#define devpriv ((struct daqboard2000_private *)dev->private)

static void writeAcqScanListEntry(struct comedi_device *dev, u16 entry)
{
struct daqboard2000_private *devpriv = dev->private;

/* udelay(4); */
writew(entry & 0x00ff, devpriv->daq + acqScanListFIFO);
/* udelay(4); */
Expand Down Expand Up @@ -365,6 +363,7 @@ static int daqboard2000_ai_insn_read(struct comedi_device *dev,
struct comedi_insn *insn,
unsigned int *data)
{
struct daqboard2000_private *devpriv = dev->private;
unsigned int val;
int gain, chan, timeout;
int i;
Expand Down Expand Up @@ -425,8 +424,9 @@ static int daqboard2000_ao_insn_read(struct comedi_device *dev,
struct comedi_insn *insn,
unsigned int *data)
{
int i;
struct daqboard2000_private *devpriv = dev->private;
int chan = CR_CHAN(insn->chanspec);
int i;

for (i = 0; i < insn->n; i++)
data[i] = devpriv->ao_readback[chan];
Expand All @@ -439,6 +439,7 @@ static int daqboard2000_ao_insn_write(struct comedi_device *dev,
struct comedi_insn *insn,
unsigned int *data)
{
struct daqboard2000_private *devpriv = dev->private;
int chan = CR_CHAN(insn->chanspec);
unsigned int val;
int timeout;
Expand Down Expand Up @@ -478,6 +479,8 @@ static int daqboard2000_ao_insn_write(struct comedi_device *dev,

static void daqboard2000_resetLocalBus(struct comedi_device *dev)
{
struct daqboard2000_private *devpriv = dev->private;

dev_dbg(dev->class_dev, "daqboard2000_resetLocalBus\n");
writel(DAQBOARD2000_SECRLocalBusHi, devpriv->plx + 0x6c);
udelay(10000);
Expand All @@ -487,6 +490,8 @@ static void daqboard2000_resetLocalBus(struct comedi_device *dev)

static void daqboard2000_reloadPLX(struct comedi_device *dev)
{
struct daqboard2000_private *devpriv = dev->private;

dev_dbg(dev->class_dev, "daqboard2000_reloadPLX\n");
writel(DAQBOARD2000_SECRReloadLo, devpriv->plx + 0x6c);
udelay(10000);
Expand All @@ -498,6 +503,8 @@ static void daqboard2000_reloadPLX(struct comedi_device *dev)

static void daqboard2000_pulseProgPin(struct comedi_device *dev)
{
struct daqboard2000_private *devpriv = dev->private;

dev_dbg(dev->class_dev, "daqboard2000_pulseProgPin 1\n");
writel(DAQBOARD2000_SECRProgPinHi, devpriv->plx + 0x6c);
udelay(10000);
Expand All @@ -507,6 +514,7 @@ static void daqboard2000_pulseProgPin(struct comedi_device *dev)

static int daqboard2000_pollCPLD(struct comedi_device *dev, int mask)
{
struct daqboard2000_private *devpriv = dev->private;
int result = 0;
int i;
int cpld;
Expand All @@ -526,6 +534,7 @@ static int daqboard2000_pollCPLD(struct comedi_device *dev, int mask)

static int daqboard2000_writeCPLD(struct comedi_device *dev, int data)
{
struct daqboard2000_private *devpriv = dev->private;
int result = 0;

udelay(10);
Expand All @@ -540,6 +549,7 @@ static int daqboard2000_writeCPLD(struct comedi_device *dev, int data)
static int initialize_daqboard2000(struct comedi_device *dev,
unsigned char *cpld_array, int len)
{
struct daqboard2000_private *devpriv = dev->private;
int result = -EIO;
/* Read the serial EEPROM control register */
int secr;
Expand Down Expand Up @@ -601,6 +611,8 @@ static void daqboard2000_adcStopDmaTransfer(struct comedi_device *dev)

static void daqboard2000_adcDisarm(struct comedi_device *dev)
{
struct daqboard2000_private *devpriv = dev->private;

/* Disable hardware triggers */
udelay(2);
writew(DAQBOARD2000_TrigAnalog | DAQBOARD2000_TrigDisable,
Expand All @@ -623,6 +635,7 @@ static void daqboard2000_adcDisarm(struct comedi_device *dev)

static void daqboard2000_activateReferenceDacs(struct comedi_device *dev)
{
struct daqboard2000_private *devpriv = dev->private;
unsigned int val;
int timeout;

Expand Down Expand Up @@ -729,21 +742,25 @@ static struct pci_dev *daqboard2000_find_pci_dev(struct comedi_device *dev,
static int daqboard2000_attach(struct comedi_device *dev,
struct comedi_devconfig *it)
{
const struct daq200_boardtype *this_board;
struct daqboard2000_private *devpriv;
struct pci_dev *pcidev;
struct comedi_subdevice *s;
resource_size_t pci_base;
void *aux_data;
unsigned int aux_len;
int result;

result = alloc_private(dev, sizeof(struct daqboard2000_private));
result = alloc_private(dev, sizeof(*devpriv));
if (result < 0)
return -ENOMEM;
devpriv = dev->private;

pcidev = daqboard2000_find_pci_dev(dev, it);
if (!pcidev)
return -EIO;
comedi_set_hw_dev(dev, &pcidev->dev);
this_board = comedi_board(dev);

result = comedi_pci_enable(pcidev, "daqboard2000");
if (result < 0) {
Expand Down Expand Up @@ -825,6 +842,7 @@ static int daqboard2000_attach(struct comedi_device *dev,
static void daqboard2000_detach(struct comedi_device *dev)
{
struct pci_dev *pcidev = comedi_to_pci_dev(dev);
struct daqboard2000_private *devpriv = dev->private;

if (dev->subdevices)
subdev_8255_cleanup(dev, &dev->subdevices[2]);
Expand Down

0 comments on commit ad375f7

Please sign in to comment.