diff options
author | Sam Ravnborg <sam@ravnborg.org> | 2008-04-18 16:57:22 -0400 |
---|---|---|
committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2008-05-02 14:26:46 -0400 |
commit | 7ad4a485002c141f156a014e89542e01e7f8e36a (patch) | |
tree | 4e7ca5e9828756f53492c4a5aa5813b8faa2e89f | |
parent | 392512fbf9407fa1647225143e3f9c28a869ac57 (diff) |
[SCSI] aic94xx: fix section mismatch
Fix following warnings:
WARNING: vmlinux.o(.data+0x17aa88): Section mismatch in reference from the variable asd_pcidev_data to the function .devinit.text:asd_aic9410_setup()
WARNING: vmlinux.o(.data+0x17aa98): Section mismatch in reference from the variable asd_pcidev_data to the function .devinit.text:asd_aic9410_setup()
WARNING: vmlinux.o(.data+0x17aaa8): Section mismatch in reference from the variable asd_pcidev_data to the function .devinit.text:asd_aic9405_setup()
asd_pcidev_data is only used by __devinit asd_pci_probe. So mark is const and
annotate it __devinitconst to fix the warnings.
[akpm@linux-foundation.org: fix warning]
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
-rw-r--r-- | drivers/scsi/aic94xx/aic94xx_init.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/scsi/aic94xx/aic94xx_init.c b/drivers/scsi/aic94xx/aic94xx_init.c index 90f5e0a6f2e3..2a730c470f62 100644 --- a/drivers/scsi/aic94xx/aic94xx_init.c +++ b/drivers/scsi/aic94xx/aic94xx_init.c | |||
@@ -529,10 +529,10 @@ static void asd_remove_dev_attrs(struct asd_ha_struct *asd_ha) | |||
529 | /* The first entry, 0, is used for dynamic ids, the rest for devices | 529 | /* The first entry, 0, is used for dynamic ids, the rest for devices |
530 | * we know about. | 530 | * we know about. |
531 | */ | 531 | */ |
532 | static struct asd_pcidev_struct { | 532 | static const struct asd_pcidev_struct { |
533 | const char * name; | 533 | const char * name; |
534 | int (*setup)(struct asd_ha_struct *asd_ha); | 534 | int (*setup)(struct asd_ha_struct *asd_ha); |
535 | } asd_pcidev_data[] = { | 535 | } asd_pcidev_data[] __devinitconst = { |
536 | /* Id 0 is used for dynamic ids. */ | 536 | /* Id 0 is used for dynamic ids. */ |
537 | { .name = "Adaptec AIC-94xx SAS/SATA Host Adapter", | 537 | { .name = "Adaptec AIC-94xx SAS/SATA Host Adapter", |
538 | .setup = asd_aic9410_setup | 538 | .setup = asd_aic9410_setup |
@@ -735,7 +735,7 @@ static int asd_unregister_sas_ha(struct asd_ha_struct *asd_ha) | |||
735 | static int __devinit asd_pci_probe(struct pci_dev *dev, | 735 | static int __devinit asd_pci_probe(struct pci_dev *dev, |
736 | const struct pci_device_id *id) | 736 | const struct pci_device_id *id) |
737 | { | 737 | { |
738 | struct asd_pcidev_struct *asd_dev; | 738 | const struct asd_pcidev_struct *asd_dev; |
739 | unsigned asd_id = (unsigned) id->driver_data; | 739 | unsigned asd_id = (unsigned) id->driver_data; |
740 | struct asd_ha_struct *asd_ha; | 740 | struct asd_ha_struct *asd_ha; |
741 | struct Scsi_Host *shost; | 741 | struct Scsi_Host *shost; |