From 0a3418304a9e71b2aaf7606d4c1f1a120132b970 Mon Sep 17 00:00:00 2001
From: Ian Abbott <abbotti@mev.co.uk>
Date: Thu, 1 Nov 2012 16:28:30 +0000
Subject: [PATCH] --- yaml --- r: 337563 b: refs/heads/master c:
 6526cd1ad04adc2ca54d34d1f003b8bb5318d337 h: refs/heads/master i:   337561:
 47b56b047a0344320db560b06a3d05f3a474a07f   337559:
 66cd4f7beb358143da7fa50d9c3824f1ab5f76ae v: v3

---
 [refs]                                          |  2 +-
 trunk/drivers/staging/comedi/drivers/gsc_hpdi.c | 15 +++++----------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 887221596a21..e176dbf188bd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 594985d6615cc214dbfaf18fb6325d89a3c82e84
+refs/heads/master: 6526cd1ad04adc2ca54d34d1f003b8bb5318d337
diff --git a/trunk/drivers/staging/comedi/drivers/gsc_hpdi.c b/trunk/drivers/staging/comedi/drivers/gsc_hpdi.c
index 816296b04e69..2246338611a9 100644
--- a/trunk/drivers/staging/comedi/drivers/gsc_hpdi.c
+++ b/trunk/drivers/staging/comedi/drivers/gsc_hpdi.c
@@ -207,11 +207,6 @@ static const struct hpdi_board hpdi_boards[] = {
 #endif
 };
 
-static inline struct hpdi_board *board(const struct comedi_device *dev)
-{
-	return (struct hpdi_board *)dev->board_ptr;
-}
-
 struct hpdi_private {
 	/*  base addresses (ioremapped) */
 	void __iomem *plx9080_iobase;
@@ -482,16 +477,19 @@ static int __devinit hpdi_auto_attach(struct comedi_device *dev,
 				      unsigned long context_unused)
 {
 	struct pci_dev *pcidev = comedi_to_pci_dev(dev);
+	const struct hpdi_board *thisboard;
 	struct hpdi_private *devpriv;
 	int i;
 	int retval;
 
-	dev->board_ptr = hpdi_find_board(pcidev);
-	if (!dev->board_ptr) {
+	thisboard = hpdi_find_board(pcidev);
+	if (!thisboard) {
 		dev_err(dev->class_dev, "gsc_hpdi: pci %s not supported\n",
 			pci_name(pcidev));
 		return -EINVAL;
 	}
+	dev->board_ptr = thisboard;
+	dev->board_name = thisboard->name;
 
 	devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
 	if (!devpriv)
@@ -506,9 +504,6 @@ static int __devinit hpdi_auto_attach(struct comedi_device *dev,
 	dev->iobase = 1;	/* the "detach" needs this */
 	pci_set_master(pcidev);
 
-	/* Initialize dev->board_name */
-	dev->board_name = board(dev)->name;
-
 	devpriv->plx9080_iobase =
 		ioremap(pci_resource_start(pcidev, PLX9080_BADDRINDEX),
 			pci_resource_len(pcidev, PLX9080_BADDRINDEX));