hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

staging: comedi: ni_65xx: 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>
This commit is contained in:
H Hartley Sweeten 2013-03-05 10:04:22 -07:00 committed by Greg Kroah-Hartman
parent 1787b7c170
commit a2fa439d9a
1 changed files with 30 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
drivers/staging/comedi/drivers/ni_65xx.c
View File

@ -257,34 +257,6 @@ static inline unsigned ni_65xx_total_num_ports(const struct ni_65xx_board
return board->num_dio_ports + board->num_di_ports + board->num_do_ports;
}
static DEFINE_PCI_DEVICE_TABLE(ni_65xx_pci_table) = {
{PCI_DEVICE(PCI_VENDOR_ID_NI, 0x1710)},
{PCI_DEVICE(PCI_VENDOR_ID_NI, 0x7085)},
{PCI_DEVICE(PCI_VENDOR_ID_NI, 0x7086)},
{PCI_DEVICE(PCI_VENDOR_ID_NI, 0x7087)},
{PCI_DEVICE(PCI_VENDOR_ID_NI, 0x7088)},
{PCI_DEVICE(PCI_VENDOR_ID_NI, 0x70a9)},
{PCI_DEVICE(PCI_VENDOR_ID_NI, 0x70c3)},
{PCI_DEVICE(PCI_VENDOR_ID_NI, 0x70c8)},
{PCI_DEVICE(PCI_VENDOR_ID_NI, 0x70c9)},
{PCI_DEVICE(PCI_VENDOR_ID_NI, 0x70cc)},
{PCI_DEVICE(PCI_VENDOR_ID_NI, 0x70CD)},
{PCI_DEVICE(PCI_VENDOR_ID_NI, 0x70d1)},
{PCI_DEVICE(PCI_VENDOR_ID_NI, 0x70d2)},
{PCI_DEVICE(PCI_VENDOR_ID_NI, 0x70d3)},
{PCI_DEVICE(PCI_VENDOR_ID_NI, 0x7124)},
{PCI_DEVICE(PCI_VENDOR_ID_NI, 0x7125)},
{PCI_DEVICE(PCI_VENDOR_ID_NI, 0x7126)},
{PCI_DEVICE(PCI_VENDOR_ID_NI, 0x7127)},
{PCI_DEVICE(PCI_VENDOR_ID_NI, 0x7128)},
{PCI_DEVICE(PCI_VENDOR_ID_NI, 0x718b)},
{PCI_DEVICE(PCI_VENDOR_ID_NI, 0x718c)},
{PCI_DEVICE(PCI_VENDOR_ID_NI, 0x71c5)},
{0}
};
MODULE_DEVICE_TABLE(pci, ni_65xx_pci_table);
struct ni_65xx_private {
struct mite_struct *mite;
unsigned int filter_interval;
@ -790,10 +762,37 @@ static int ni_65xx_pci_probe(struct pci_dev *dev,
return comedi_pci_auto_config(dev, &ni_65xx_driver, id->driver_data);
}
static DEFINE_PCI_DEVICE_TABLE(ni_65xx_pci_table) = {
{ PCI_DEVICE(PCI_VENDOR_ID_NI, 0x1710) },
{ PCI_DEVICE(PCI_VENDOR_ID_NI, 0x7085) },
{ PCI_DEVICE(PCI_VENDOR_ID_NI, 0x7086) },
{ PCI_DEVICE(PCI_VENDOR_ID_NI, 0x7087) },
{ PCI_DEVICE(PCI_VENDOR_ID_NI, 0x7088) },
{ PCI_DEVICE(PCI_VENDOR_ID_NI, 0x70a9) },
{ PCI_DEVICE(PCI_VENDOR_ID_NI, 0x70c3) },
{ PCI_DEVICE(PCI_VENDOR_ID_NI, 0x70c8) },
{ PCI_DEVICE(PCI_VENDOR_ID_NI, 0x70c9) },
{ PCI_DEVICE(PCI_VENDOR_ID_NI, 0x70cc) },
{ PCI_DEVICE(PCI_VENDOR_ID_NI, 0x70CD) },
{ PCI_DEVICE(PCI_VENDOR_ID_NI, 0x70d1) },
{ PCI_DEVICE(PCI_VENDOR_ID_NI, 0x70d2) },
{ PCI_DEVICE(PCI_VENDOR_ID_NI, 0x70d3) },
{ PCI_DEVICE(PCI_VENDOR_ID_NI, 0x7124) },
{ PCI_DEVICE(PCI_VENDOR_ID_NI, 0x7125) },
{ PCI_DEVICE(PCI_VENDOR_ID_NI, 0x7126) },
{ PCI_DEVICE(PCI_VENDOR_ID_NI, 0x7127) },
{ PCI_DEVICE(PCI_VENDOR_ID_NI, 0x7128) },
{ PCI_DEVICE(PCI_VENDOR_ID_NI, 0x718b) },
{ PCI_DEVICE(PCI_VENDOR_ID_NI, 0x718c) },
{ PCI_DEVICE(PCI_VENDOR_ID_NI, 0x71c5) },
{ 0 }
};
MODULE_DEVICE_TABLE(pci, ni_65xx_pci_table);
static struct pci_driver ni_65xx_pci_driver = {
.name = "ni_65xx",
.id_table = ni_65xx_pci_table,
.probe = ni_65xx_pci_probe,
.name = "ni_65xx",
.id_table = ni_65xx_pci_table,
.probe = ni_65xx_pci_probe,
.remove = comedi_pci_auto_unconfig,
};
module_comedi_pci_driver(ni_65xx_driver, ni_65xx_pci_driver);