Re: [PATCH 1/5] block: make PCI device id constant

Németh Márton
2010-01-10T15:41:51Z

From: Márton Németh <nm127@freemail.hu>

Use DEFINE_PCI_DEVICE_TABLE() when declaring the PCI device
table as suggested in Documentation/PCI/pci.txt .

Signed-off-by: Márton Németh <nm127@freemail.hu>
---
--- drivers/block/DAC960.c.orig 2010-01-10 16:12:25.000000000 +0100
+++ drivers/block/DAC960.c 2010-01-10 16:16:26.000000000 +0100
@@ -7134,7 +7134,7 @@
.MemoryWindowSize = DAC960_PD_RegisterWindowSize,
};

-static struct pci_device_id DAC960_id_table[] = {
+static DEFINE_PCI_DEVICE_TABLE(DAC960_id_table) = {
{
.vendor = PCI_VENDOR_ID_MYLEX,
.device = PCI_DEVICE_ID_MYLEX_DAC960_GEM,
--- drivers/block/sx8.c.orig 2010-01-10 16:12:38.000000000 +0100
+++ drivers/block/sx8.c 2010-01-10 16:17:57.000000000 +0100
@@ -409,7 +409,7 @@
static void carm_remove_one (struct pci_dev *pdev);
static int carm_bdev_getgeo(struct block_device *bdev, struct hd_geometry *geo);

-static struct pci_device_id carm_pci_tbl[] = {
+static DEFINE_PCI_DEVICE_TABLE(carm_pci_tbl) = {
{ PCI_VENDOR_ID_PROMISE, 0x8000, PCI_ANY_ID, PCI_ANY_ID, 0, 0, },
{ PCI_VENDOR_ID_PROMISE, 0x8002, PCI_ANY_ID, PCI_ANY_ID, 0, 0, },
{ } /* terminate list */