Commit b66cae76 authored Feb 26, 2008 by Sam Ravnborg Committed by Bartlomiej Zolnierkiewicz Feb 26, 2008

hpt366: fix section mismatch warnings

Fix following warnings:
WARNING: o-sparc64/vmlinux.o(.data+0x195a38): Section mismatch in reference from the variable hpt37x_info.0 to the variable .devinit.data:hpt370
WARNING: o-sparc64/vmlinux.o(.data+0x195a40): Section mismatch in reference from the variable hpt37x_info.0 to the variable .devinit.data:hpt370a
WARNING: o-sparc64/vmlinux.o(.data+0x195a48): Section mismatch in reference from the variable hpt37x_info.0 to the variable .devinit.data:hpt372
WARNING: o-sparc64/vmlinux.o(.data+0x195a50): Section mismatch in reference from the variable hpt37x_info.0 to the variable .devinit.data:hpt372n

Replace a static array with a small switch resulting in
more readable code.
Mark the pci table __devinitconst.

A lot of variables are const but annotated __devinitdata.
Annotating them __devinitconst would cause a section type
conflict error when build for 64 bit powerpc.

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Cc: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

parent acbe44e6

drivers/ide/pci/hpt366.c

+7 −5

Original line number	Diff line number	Diff line
		@@ -1570,10 +1570,12 @@ static int __devinit hpt366_init_one(struct pci_dev *dev, const struct pci_devic
		if (rev < 3)
		info = &hpt36x;
		else {
		static const struct hpt_info *hpt37x_info[] =
		{ &hpt370, &hpt370a, &hpt372, &hpt372n };

		info = hpt37x_info[min_t(u8, rev, 6) - 3];
		switch (min_t(u8, rev, 6)) {
		case 3: info = &hpt370; break;
		case 4: info = &hpt370a; break;
		case 5: info = &hpt372; break;
		case 6: info = &hpt372n; break;
		}
		idx++;
		}
		break;
		@@ -1626,7 +1628,7 @@ static int __devinit hpt366_init_one(struct pci_dev *dev, const struct pci_devic
		return ide_setup_pci_device(dev, &d);
		}

		static const struct pci_device_id hpt366_pci_tbl[] = {
		static const struct pci_device_id hpt366_pci_tbl[] __devinitconst = {
		{ PCI_VDEVICE(TTI, PCI_DEVICE_ID_TTI_HPT366), 0 },
		{ PCI_VDEVICE(TTI, PCI_DEVICE_ID_TTI_HPT372), 1 },
		{ PCI_VDEVICE(TTI, PCI_DEVICE_ID_TTI_HPT302), 2 },

Admin message