From 6fa8adc6aea900bad0e09ba442050c38dd96832f Mon Sep 17 00:00:00 2001
From: H Hartley Sweeten <hsweeten@visionengravers.com>
Date: Tue, 5 Mar 2013 10:22:06 -0700
Subject: [PATCH] --- yaml --- r: 363404 b: refs/heads/master c:
 151df466b681181bc1b0543df79620d4e805e531 h: refs/heads/master v: v3

---
 [refs]                                      |  2 +-
 trunk/drivers/staging/comedi/drivers/skel.c | 33 ++++++++++++---------
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index e6644b9c5551..632cd647144b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b3322d422e65bcfd0a70444c9a0f240aaa8d0b07
+refs/heads/master: 151df466b681181bc1b0543df79620d4e805e531
diff --git a/trunk/drivers/staging/comedi/drivers/skel.c b/trunk/drivers/staging/comedi/drivers/skel.c
index 8cedc4cf020c..53bbe9e5f98b 100644
--- a/trunk/drivers/staging/comedi/drivers/skel.c
+++ b/trunk/drivers/staging/comedi/drivers/skel.c
@@ -689,11 +689,22 @@ static struct comedi_driver skel_driver = {
 
 #ifdef CONFIG_COMEDI_PCI_DRIVERS
 
-/* This is used by modprobe to translate PCI IDs to drivers.  Should
- * only be used for PCI and ISA-PnP devices */
-/* Please add your PCI vendor ID to comedidev.h, and it will be forwarded
- * upstream. */
-#define PCI_VENDOR_ID_SKEL 0xdafe
+static int skel_pci_probe(struct pci_dev *dev,
+			  const struct pci_device_id *id)
+{
+	return comedi_pci_auto_config(dev, &skel_driver, id->driver_data);
+}
+
+/*
+ * Please add your PCI vendor ID to comedidev.h, and it will
+ * be forwarded upstream.
+ */
+#define PCI_VENDOR_ID_SKEL	0xdafe
+
+/*
+ * This is used by modprobe to translate PCI IDs to drivers.
+ * Should only be used for PCI and ISA-PnP devices
+ */
 static DEFINE_PCI_DEVICE_TABLE(skel_pci_table) = {
 	{ PCI_DEVICE(PCI_VENDOR_ID_SKEL, 0x0100) },
 	{ PCI_DEVICE(PCI_VENDOR_ID_SKEL, 0x0200) },
@@ -701,16 +712,10 @@ static DEFINE_PCI_DEVICE_TABLE(skel_pci_table) = {
 };
 MODULE_DEVICE_TABLE(pci, skel_pci_table);
 
-static int skel_pci_probe(struct pci_dev *dev,
-			  const struct pci_device_id *id)
-{
-	return comedi_pci_auto_config(dev, &skel_driver, id->driver_data);
-}
-
 static struct pci_driver skel_pci_driver = {
-	.name = "dummy",
-	.id_table = skel_pci_table,
-	.probe = &skel_pci_probe,
+	.name		= "dummy",
+	.id_table	= skel_pci_table,
+	.probe		= skel_pci_probe,
 	.remove		= comedi_pci_auto_unconfig,
 };
 module_comedi_pci_driver(skel_driver, skel_pci_driver);