summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorH Hartley Sweeten <hartleys@visionengravers.com>2012-10-26 00:24:23 (GMT)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-10-26 16:18:16 (GMT)
commit0473c02a8b560e7a59af4a2d5132ef0ade0f6a33 (patch)
tree843c79b7ec2a41abd7c7993596ce4e61be4f2145 /drivers
parentea8690997095a8ba8d9dc22ae7fe75e64f047e38 (diff)
downloadlinux-fsl-qoriq-0473c02a8b560e7a59af4a2d5132ef0ade0f6a33.tar.xz
staging: comedi: dt3000: remove this_board macro
This macro relies on a local variable having a specific name. Remove it and use the comedi_board() helper to get the pointer. 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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/staging/comedi/drivers/dt3000.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/staging/comedi/drivers/dt3000.c b/drivers/staging/comedi/drivers/dt3000.c
index 29e6f8e..7eda7dd 100644
--- a/drivers/staging/comedi/drivers/dt3000.c
+++ b/drivers/staging/comedi/drivers/dt3000.c
@@ -159,8 +159,6 @@ static const struct dt3k_boardtype dt3k_boardtypes[] = {
},
};
-#define this_board ((const struct dt3k_boardtype *)dev->board_ptr)
-
#define DT3000_SIZE (4*0x1000)
/* dual-ported RAM location definitions */
@@ -410,6 +408,7 @@ static void dt3k_ai_empty_fifo(struct comedi_device *dev,
static int dt3k_ai_cmdtest(struct comedi_device *dev,
struct comedi_subdevice *s, struct comedi_cmd *cmd)
{
+ const struct dt3k_boardtype *this_board = comedi_board(dev);
int err = 0;
int tmp;
@@ -796,6 +795,7 @@ static struct pci_dev *dt3000_find_pci_dev(struct comedi_device *dev,
static int dt3000_attach(struct comedi_device *dev, struct comedi_devconfig *it)
{
+ const struct dt3k_boardtype *this_board;
struct dt3k_private *devpriv;
struct pci_dev *pcidev;
struct comedi_subdevice *s;
@@ -813,6 +813,7 @@ static int dt3000_attach(struct comedi_device *dev, struct comedi_devconfig *it)
if (!pcidev)
return -EIO;
comedi_set_hw_dev(dev, &pcidev->dev);
+ this_board = comedi_board(dev);
ret = comedi_pci_enable(pcidev, "dt3000");
if (ret < 0)