[Patch 4/4] Clear up section mismatch for ioc4_ide_attach_one.

[Patch 4/4] Clear up section mismatch for ioc4_ide_attach_one.

[Robin Holt]

The generic_defconfig has three section mismatches.  This clears up
ioc4_ide_attach_one().

Signed-off-by: Robin Holt <holt@sgi.com>
Signed-off-by: Mike Reid <mdr@sgi.com>

---

 drivers/ide/sgiioc4.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
Index: v2.6.28-rc7-20081208-218d11a/drivers/ide/sgiioc4.c
=================================--- v2.6.28-rc7-20081208-218d11a.orig/drivers/ide/sgiioc4.c	2008-12-08 08:23:34.955487702 -0600
+++ v2.6.28-rc7-20081208-218d11a/drivers/ide/sgiioc4.c	2008-12-08 08:24:41.191746826 -0600
@@ -633,7 +633,7 @@ out:
 	return ret;
 }
 
-int
+int __devinit
 ioc4_ide_attach_one(struct ioc4_driver_data *idd)
 {
 	/* PCI-RT does not bring out IDE connection.
@@ -645,7 +645,7 @@ ioc4_ide_attach_one(struct ioc4_driver_d
 	return pci_init_sgiioc4(idd->idd_pdev);
 }
 
-static struct ioc4_submodule ioc4_ide_submodule = {
+static struct ioc4_submodule __devinitdata ioc4_ide_submodule = {
 	.is_name = "IOC4_ide",
 	.is_owner = THIS_MODULE,
 	.is_probe = ioc4_ide_attach_one,

RE: [Patch 4/4] Clear up section mismatch for ioc4_ide_attach_one.

[Luck, Tony]

> The generic_defconfig has three section mismatches.  This clears up
> ioc4_ide_attach_one().

After applying this patch (and parts 2&3 too) I got a build error (using
gcc 4.3.1 ... which I think is pickier about some of this section stuff):

drivers/ide/sgiioc4.c:533: error: sgiioc4_port_info causes a section type conflict

The declaration for this should really be using __devinitconst rather
than __devinitdata.  I can fold a s/__devinitdata/__devinitconst/ patch
into this one if that looks OK to you.

-Tony

Re: [Patch 4/4] Clear up section mismatch for ioc4_ide_attach_one.

[Robin Holt]

On Mon, Dec 08, 2008 at 03:50:06PM -0800, Luck, Tony wrote:
> > The generic_defconfig has three section mismatches.  This clears up
> > ioc4_ide_attach_one().
> 
> After applying this patch (and parts 2&3 too) I got a build error (using
> gcc 4.3.1 ... which I think is pickier about some of this section stuff):
> 
> drivers/ide/sgiioc4.c:533: error: sgiioc4_port_info causes a section type conflict
> 
> The declaration for this should really be using __devinitconst rather
> than __devinitdata.  I can fold a s/__devinitdata/__devinitconst/ patch
> into this one if that looks OK to you.

That would be wonderful.

Thank you,
Robin