summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorH Hartley Sweeten <hsweeten@visionengravers.com>2013-03-05 17:03:34 (GMT)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-03-11 17:03:32 (GMT)
commitdcf9cfd3b1807a28fd46ca73489bc401827fd933 (patch)
treebf3477c91a41d5df369cb7b2d18f41419900f83e
parenta4493f07c67bb774519189044ae90034466748a6 (diff)
downloadlinux-fsl-qoriq-dcf9cfd3b1807a28fd46ca73489bc401827fd933.tar.xz
staging: comedi: ni_6527: cleanup pci_driver declaration
For aesthetic reasons, add some whitespace to the pci_driver declaration. Also, move the pci device table near the pci_driver. Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com> Cc: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/comedi/drivers/ni_6527.c21
1 files changed, 10 insertions, 11 deletions
diff --git a/drivers/staging/comedi/drivers/ni_6527.c b/drivers/staging/comedi/drivers/ni_6527.c
index 507c121..41945df 100644
--- a/drivers/staging/comedi/drivers/ni_6527.c
+++ b/drivers/staging/comedi/drivers/ni_6527.c
@@ -100,14 +100,6 @@ static const struct ni6527_board ni6527_boards[] = {
#define this_board ((const struct ni6527_board *)dev->board_ptr)
-static DEFINE_PCI_DEVICE_TABLE(ni6527_pci_table) = {
- {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x2b10)},
- {PCI_DEVICE(PCI_VENDOR_ID_NI, 0x2b20)},
- {0}
-};
-
-MODULE_DEVICE_TABLE(pci, ni6527_pci_table);
-
struct ni6527_private {
struct mite_struct *mite;
unsigned int filter_interval;
@@ -454,10 +446,17 @@ static int ni6527_pci_probe(struct pci_dev *dev,
return comedi_pci_auto_config(dev, &ni6527_driver, id->driver_data);
}
+static DEFINE_PCI_DEVICE_TABLE(ni6527_pci_table) = {
+ { PCI_DEVICE(PCI_VENDOR_ID_NI, 0x2b10) },
+ { PCI_DEVICE(PCI_VENDOR_ID_NI, 0x2b20) },
+ { 0 }
+};
+MODULE_DEVICE_TABLE(pci, ni6527_pci_table);
+
static struct pci_driver ni6527_pci_driver = {
- .name = DRIVER_NAME,
- .id_table = ni6527_pci_table,
- .probe = ni6527_pci_probe,
+ .name = DRIVER_NAME,
+ .id_table = ni6527_pci_table,
+ .probe = ni6527_pci_probe,
.remove = comedi_pci_auto_unconfig,
};
module_comedi_pci_driver(ni6527_driver, ni6527_pci_driver);