2012-06-27 22:08:15

by Hartley Sweeten

[permalink] [raw]
Subject: [PATCH 18/19] staging: comedi: adl_pci6208: cleanup pci6208_attach()

For aesthetic reasons, set the dev->board_name as soon as the
thisboard pointer is available.

Signed-off-by: H Hartley Sweeten <[email protected]>
Cc: Ian Abbott <[email protected]>
Cc: Frank Mori Hess <[email protected]>
Cc: Greg Kroah-Hartman <[email protected]>
---
drivers/staging/comedi/drivers/adl_pci6208.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/comedi/drivers/adl_pci6208.c b/drivers/staging/comedi/drivers/adl_pci6208.c
index aa2db5d..cb14ffd 100644
--- a/drivers/staging/comedi/drivers/adl_pci6208.c
+++ b/drivers/staging/comedi/drivers/adl_pci6208.c
@@ -213,17 +213,16 @@ static int pci6208_attach(struct comedi_device *dev,
return -EIO;
thisboard = comedi_board(dev);

+ dev->board_name = thisboard->name;
+
ret = comedi_pci_enable(devpriv->pci_dev, "adl_pci6208");
if (ret) {
dev_err(dev->class_dev,
"Failed to enable PCI device and request regions\n");
return ret;
}
-
dev->iobase = pci_resource_start(devpriv->pci_dev, 2);

- dev->board_name = thisboard->name;
-
ret = comedi_alloc_subdevices(dev, 2);
if (ret)
return ret;
--
1.7.11