[PATCH] drivers/block/: add __devinitdata to all pci_device_id table of block drivers

[PATCH] drivers/block/: add __devinitdata to all pci_device_id table of block drivers

[Denis Cheng]

Signed-off-by: Denis Cheng <crquan@gmail.com>
---
 drivers/block/DAC960.c   |    2 +-
 drivers/block/cciss.c    |    2 +-
 drivers/block/cpqarray.c |    2 +-
 drivers/block/sx8.c      |    2 +-
 drivers/block/umem.c     |    2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/block/DAC960.c b/drivers/block/DAC960.c
index cd03473..3bdaabc 100644
--- a/drivers/block/DAC960.c
+++ b/drivers/block/DAC960.c
@@ -7102,7 +7102,7 @@ static struct DAC960_privdata DAC960_P_privdata = {
 	.MemoryWindowSize =	DAC960_PD_RegisterWindowSize,
 };
 
-static struct pci_device_id DAC960_id_table[] = {
+static struct pci_device_id DAC960_id_table[] __devinitdata = {
 	{
 		.vendor 	= PCI_VENDOR_ID_MYLEX,
 		.device		= PCI_DEVICE_ID_MYLEX_DAC960_GEM,
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index 855ce8e..2e19ef4 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -67,7 +67,7 @@ MODULE_LICENSE("GPL");
 #include <linux/cciss_ioctl.h>
 
 /* define the PCI info for the cards we can control */
-static const struct pci_device_id cciss_pci_device_id[] = {
+static const struct pci_device_id cciss_pci_device_id[] __devinitdata = {
 	{PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_CISS,  0x0E11, 0x4070},
 	{PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_CISSB, 0x0E11, 0x4080},
 	{PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_CISSB, 0x0E11, 0x4082},
diff --git a/drivers/block/cpqarray.c b/drivers/block/cpqarray.c
index 6919918..15204b9 100644
--- a/drivers/block/cpqarray.c
+++ b/drivers/block/cpqarray.c
@@ -96,7 +96,7 @@ static struct board_type products[] = {
 };
 
 /* define the PCI info for the PCI cards this driver can control */
-static const struct pci_device_id cpqarray_pci_device_id[] =
+static const struct pci_device_id cpqarray_pci_device_id[] __devinitdata =
 {
 	{ PCI_VENDOR_ID_DEC, PCI_DEVICE_ID_COMPAQ_42XX,
 		0x0E11, 0x4058, 0, 0, 0},       /* SA431 */
diff --git a/drivers/block/sx8.c b/drivers/block/sx8.c
index cd5674b..d3e18d7 100644
--- a/drivers/block/sx8.c
+++ b/drivers/block/sx8.c
@@ -409,7 +409,7 @@ static int carm_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
 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 struct pci_device_id carm_pci_tbl[] __devinitdata = {
 	{ 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 */
diff --git a/drivers/block/umem.c b/drivers/block/umem.c
index c24e1bd..98846f8 100644
--- a/drivers/block/umem.c
+++ b/drivers/block/umem.c
@@ -1053,7 +1053,7 @@ static void mm_pci_remove(struct pci_dev *dev)
 	pci_disable_device(dev);
 }
 
-static const struct pci_device_id mm_pci_ids[] = {
+static const struct pci_device_id mm_pci_ids[] __devinitdata = {
     {PCI_DEVICE(PCI_VENDOR_ID_MICRO_MEMORY, PCI_DEVICE_ID_MICRO_MEMORY_5415CN)},
     {PCI_DEVICE(PCI_VENDOR_ID_MICRO_MEMORY, PCI_DEVICE_ID_MICRO_MEMORY_5425CN)},
     {PCI_DEVICE(PCI_VENDOR_ID_MICRO_MEMORY, PCI_DEVICE_ID_MICRO_MEMORY_6155)},
-- 
1.5.3.8

Re: [PATCH] drivers/block/: add __devinitdata to all pci_device_id table of block drivers

[Frank Seidel]

On Sunday 03 February 2008 04:12, Denis Cheng wrote:
> --- a/drivers/block/cciss.c
> +++ b/drivers/block/cciss.c
> @@ -67,7 +67,7 @@ MODULE_LICENSE("GPL");
>  #include <linux/cciss_ioctl.h>
>  
>  /* define the PCI info for the cards we can control */
> -static const struct pci_device_id cciss_pci_device_id[] = {
> +static const struct pci_device_id cciss_pci_device_id[] __devinitdata = {

it should be __devinitconst here

> --- a/drivers/block/cpqarray.c
> +++ b/drivers/block/cpqarray.c
> @@ -96,7 +96,7 @@ static struct board_type products[] = {
>  };
>  
>  /* define the PCI info for the PCI cards this driver can control */
> -static const struct pci_device_id cpqarray_pci_device_id[] =
> +static const struct pci_device_id cpqarray_pci_device_id[] __devinitdata =

same here

> --- a/drivers/block/umem.c
> +++ b/drivers/block/umem.c
> @@ -1053,7 +1053,7 @@ static void mm_pci_remove(struct pci_dev *dev)
>  	pci_disable_device(dev);
>  }
>  
> -static const struct pci_device_id mm_pci_ids[] = {
> +static const struct pci_device_id mm_pci_ids[] __devinitdata = {

same here

Thanks,
Frank