Skip to content

Commit

Permalink
staging: comedi: skel: move skel_pci_table
Browse files Browse the repository at this point in the history
Move `skel_pci_table[]` closer to `skel_pci_table` so it falls within
the same `#ifdef`.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Ian Abbott authored and Greg Kroah-Hartman committed Nov 1, 2012
1 parent 753b18d commit d8d7a82
Showing 1 changed file with 13 additions and 13 deletions.
26 changes: 13 additions & 13 deletions drivers/staging/comedi/drivers/skel.c
Original file line number Diff line number Diff line change
Expand Up @@ -112,19 +112,6 @@ static const struct skel_board skel_boards[] = {
},
};

/* 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 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);

/* this structure is for data unique to this hardware driver. If
several hardware drivers keep similar information in this structure,
feel free to suggest moving the variable to the struct comedi_device struct.
Expand Down Expand Up @@ -564,6 +551,19 @@ 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 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 __devinit skel_pci_probe(struct pci_dev *dev,
const struct pci_device_id *ent)
{
Expand Down

0 comments on commit d8d7a82

Please sign in to comment.