From 5432e3f3e9f2d2644115b9c881c1e9dad0e1f8fc Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Wed, 15 Aug 2012 17:30:26 -0700 Subject: [PATCH] staging: comedi: contec_pci_dio: remove thisboard macro This macro relies on a local variable of a specific name. Remove the macro and use the comedi_board() helper to get the thisboard pointer. Move the 'dev->board_name = thisboard->name;' in contec_attach(). The contec_find_pci_dev() function modifies the dev->board_ptr. Signed-off-by: H Hartley Sweeten Cc: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- drivers/staging/comedi/drivers/contec_pci_dio.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/staging/comedi/drivers/contec_pci_dio.c b/drivers/staging/comedi/drivers/contec_pci_dio.c index 944cfeeb2b2d..71b7266e43e8 100644 --- a/drivers/staging/comedi/drivers/contec_pci_dio.c +++ b/drivers/staging/comedi/drivers/contec_pci_dio.c @@ -55,12 +55,11 @@ static const struct contec_board contec_boards[] = { #define PCI_DEVICE_ID_PIO1616L 0x8172 -#define thisboard ((const struct contec_board *)dev->board_ptr) - static int contec_do_insn_bits(struct comedi_device *dev, struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) { + const struct contec_board *thisboard = comedi_board(dev); dev_dbg(dev->class_dev, "contec_do_insn_bits called\n"); dev_dbg(dev->class_dev, "data: %d %d\n", data[0], data[1]); @@ -79,6 +78,7 @@ static int contec_di_insn_bits(struct comedi_device *dev, struct comedi_subdevice *s, struct comedi_insn *insn, unsigned int *data) { + const struct contec_board *thisboard = comedi_board(dev); dev_dbg(dev->class_dev, "contec_di_insn_bits called\n"); dev_dbg(dev->class_dev, "data: %d %d\n", data[0], data[1]); @@ -116,14 +116,13 @@ static struct pci_dev *contec_find_pci_dev(struct comedi_device *dev, static int contec_attach(struct comedi_device *dev, struct comedi_devconfig *it) { + const struct contec_board *thisboard; struct pci_dev *pcidev; struct comedi_subdevice *s; int ret; printk("comedi%d: contec: ", dev->minor); - dev->board_name = thisboard->name; - ret = comedi_alloc_subdevices(dev, 2); if (ret) return ret; @@ -132,6 +131,8 @@ static int contec_attach(struct comedi_device *dev, struct comedi_devconfig *it) if (!pcidev) return -EIO; comedi_set_hw_dev(dev, &pcidev->dev); + thisboard = comedi_board(dev); + dev->board_name = thisboard->name; if (comedi_pci_enable(pcidev, "contec_pci_dio")) { printk("error enabling PCI device and request regions!\n"); -- 2.20.1