From: Chase Southwood Date: Wed, 7 May 2014 07:04:17 +0000 (-0500) Subject: staging: comedi: addi_apci_1564: remove boardinfo X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=55292b3d543a313aee456b3acb4cb0290ca2977c;p=openwrt%2Fstaging%2Fblogic.git staging: comedi: addi_apci_1564: remove boardinfo This driver only supports a single board type. Remove the boardinfo and its use in the driver. Signed-off-by: Chase Southwood Reviewed-by: Ian Abbott Reviewed-by: H Hartley Sweeten Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/drivers/addi_apci_1564.c b/drivers/staging/comedi/drivers/addi_apci_1564.c index d7a5c2f9d6e3..cbccbb6a2b76 100644 --- a/drivers/staging/comedi/drivers/addi_apci_1564.c +++ b/drivers/staging/comedi/drivers/addi_apci_1564.c @@ -8,16 +8,6 @@ #include "addi-data/hwdrv_apci1564.c" -static const struct addi_board apci1564_boardtypes[] = { - { - .pc_DriverName = "apci1564", - .i_NbrDiChannel = 32, - .i_NbrDoChannel = 32, - .i_DoMaxdata = 0xffffffff, - .i_Timer = 1, - }, -}; - static irqreturn_t v_ADDI_Interrupt(int irq, void *d) { apci1564_interrupt(irq, d); @@ -60,12 +50,11 @@ static int apci1564_auto_attach(struct comedi_device *dev, unsigned long context_unused) { struct pci_dev *pcidev = comedi_to_pci_dev(dev); - const struct addi_board *this_board = comedi_board(dev); struct addi_private *devpriv; struct comedi_subdevice *s; int ret; - dev->board_name = this_board->pc_DriverName; + dev->board_name = dev->driver->driver_name; devpriv = comedi_alloc_devpriv(dev, sizeof(*devpriv)); if (!devpriv)