Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 7ad4a485002c141f156a014e89542e01e7f8e36a

Authored by Sam Ravnborg
Committed by James Bottomley
1 parent 392512fbf9
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[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>

Showing 1 changed file with 3 additions and 3 deletions Side-by-side Diff

drivers/scsi/aic94xx/aic94xx_init.c
Diff comments   View file @ 7ad4a48
... ... @@ -529,10 +529,10 @@
529 529 /* The first entry, 0, is used for dynamic ids, the rest for devices
530 530 * we know about.
531 531 */
532   -static struct asd_pcidev_struct {
  532 +static const struct asd_pcidev_struct {
533 533 const char * name;
534 534 int (*setup)(struct asd_ha_struct *asd_ha);
535   -} asd_pcidev_data[] = {
  535 +} asd_pcidev_data[] __devinitconst = {
536 536 /* Id 0 is used for dynamic ids. */
537 537 { .name = "Adaptec AIC-94xx SAS/SATA Host Adapter",
538 538 .setup = asd_aic9410_setup
... ... @@ -735,7 +735,7 @@
735 735 static int __devinit asd_pci_probe(struct pci_dev *dev,
736 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 739 unsigned asd_id = (unsigned) id->driver_data;
740 740 struct asd_ha_struct *asd_ha;
741 741 struct Scsi_Host *shost;