From dd1334f063c672cb79b6a0367d46b4bfed1da30d Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hsweeten@visionengravers.com>
Date: Tue, 5 Mar 2013 10:26:23 -0700
Subject: [PATCH] --- yaml --- r: 363415 b: refs/heads/master c:
 2667079167fcb7300fe7c215b6ca07b1bceb8717 h: refs/heads/master i:   363413:
 54c83294aee450f306fc6b38b46bdad902c4a419   363411:
 da05d6a2bef8264d7199c72c22d9156ebcbae4de   363407:
 55f8d7ff08e1ed7d542f8f67e3092a6cc2d94897 v: v3

---
 [refs]                                        |  2 +-
 .../staging/comedi/drivers/addi_apci_1710.c   | 30 +------------------
 2 files changed, 2 insertions(+), 30 deletions(-)

diff --git a/[refs] b/[refs]
index 87c55d8088dd..74aa3948ac67 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cf55a71e43685b39ea6a2cf568a54d05b12b97d5
+refs/heads/master: 2667079167fcb7300fe7c215b6ca07b1bceb8717
diff --git a/trunk/drivers/staging/comedi/drivers/addi_apci_1710.c b/trunk/drivers/staging/comedi/drivers/addi_apci_1710.c
index 068b0169f4c7..f654eb03473a 100644
--- a/trunk/drivers/staging/comedi/drivers/addi_apci_1710.c
+++ b/trunk/drivers/staging/comedi/drivers/addi_apci_1710.c
@@ -21,49 +21,21 @@ static void fpu_end(void)
 #include "addi-data/addi_eeprom.c"
 #include "addi-data/hwdrv_APCI1710.c"
 
-static const struct addi_board apci1710_boardtypes[] = {
-	{
-		.pc_DriverName		= "apci1710",
-		.i_VendorId		= PCI_VENDOR_ID_ADDIDATA_OLD,
-		.i_DeviceId		= APCI1710_BOARD_DEVICE_ID,
-	},
-};
-
 static irqreturn_t v_ADDI_Interrupt(int irq, void *d)
 {
 	v_APCI1710_Interrupt(irq, d);
 	return IRQ_RETVAL(1);
 }
 
-static const void *apci1710_find_boardinfo(struct comedi_device *dev,
-					   struct pci_dev *pcidev)
-{
-	const struct addi_board *this_board;
-	int i;
-
-	for (i = 0; i < ARRAY_SIZE(apci1710_boardtypes); i++) {
-		this_board = &apci1710_boardtypes[i];
-		if (this_board->i_VendorId == pcidev->vendor &&
-		    this_board->i_DeviceId == pcidev->device)
-			return this_board;
-	}
-	return NULL;
-}
-
 static int apci1710_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;
 	struct addi_private *devpriv;
 	struct comedi_subdevice *s;
 	int ret;
 
-	this_board = apci1710_find_boardinfo(dev, pcidev);
-	if (!this_board)
-		return -ENODEV;
-	dev->board_ptr = this_board;
-	dev->board_name = this_board->pc_DriverName;
+	dev->board_name = dev->driver->driver_name;
 
 	devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
 	if (!devpriv)