Commit 7ad4a485 authored by Sam Ravnborg's avatar Sam Ravnborg Committed by James Bottomley

[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: default avatarSam Ravnborg <sam@ravnborg.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
parent 392512fb
...@@ -529,10 +529,10 @@ static void asd_remove_dev_attrs(struct asd_ha_struct *asd_ha) ...@@ -529,10 +529,10 @@ static void asd_remove_dev_attrs(struct asd_ha_struct *asd_ha)
/* The first entry, 0, is used for dynamic ids, the rest for devices /* The first entry, 0, is used for dynamic ids, the rest for devices
* we know about. * we know about.
*/ */
static struct asd_pcidev_struct { static const struct asd_pcidev_struct {
const char * name; const char * name;
int (*setup)(struct asd_ha_struct *asd_ha); int (*setup)(struct asd_ha_struct *asd_ha);
} asd_pcidev_data[] = { } asd_pcidev_data[] __devinitconst = {
/* Id 0 is used for dynamic ids. */ /* Id 0 is used for dynamic ids. */
{ .name = "Adaptec AIC-94xx SAS/SATA Host Adapter", { .name = "Adaptec AIC-94xx SAS/SATA Host Adapter",
.setup = asd_aic9410_setup .setup = asd_aic9410_setup
...@@ -735,7 +735,7 @@ static int asd_unregister_sas_ha(struct asd_ha_struct *asd_ha) ...@@ -735,7 +735,7 @@ static int asd_unregister_sas_ha(struct asd_ha_struct *asd_ha)
static int __devinit asd_pci_probe(struct pci_dev *dev, static int __devinit asd_pci_probe(struct pci_dev *dev,
const struct pci_device_id *id) const struct pci_device_id *id)
{ {
struct asd_pcidev_struct *asd_dev; const struct asd_pcidev_struct *asd_dev;
unsigned asd_id = (unsigned) id->driver_data; unsigned asd_id = (unsigned) id->driver_data;
struct asd_ha_struct *asd_ha; struct asd_ha_struct *asd_ha;
struct Scsi_Host *shost; struct Scsi_Host *shost;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment