Skip to content

Commit

Permalink
staging: comedi: skel: cleanup pci_driver declaration
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Mar 11, 2013
1 parent b3322d4 commit 151df46
Showing 1 changed file with 19 additions and 14 deletions.
33 changes: 19 additions & 14 deletions drivers/staging/comedi/drivers/skel.c
Original file line number Diff line number Diff line change
Expand Up @@ -689,28 +689,33 @@ 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) },
{ 0 }
};
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);
Expand Down

0 comments on commit 151df46

Please sign in to comment.