From d076d2bd0d9379314df5f2ab8b9c83f617c70923 Mon Sep 17 00:00:00 2001 From: Paul Mundt Date: Tue, 26 May 2009 23:10:15 +0900 Subject: sh: pci-sh7751: Initialize io_map_base in controller definition. As there is only a single controller and remapping has no impact for the address range in question, just initialize it directly in the controller definition. This fixes up boot time warnings about not having the field initialized. Signed-off-by: Paul Mundt --- arch/sh/drivers/pci/pci-sh7751.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'arch/sh/drivers') diff --git a/arch/sh/drivers/pci/pci-sh7751.c b/arch/sh/drivers/pci/pci-sh7751.c index c4fa0bb1397..70c1999a0ec 100644 --- a/arch/sh/drivers/pci/pci-sh7751.c +++ b/arch/sh/drivers/pci/pci-sh7751.c @@ -52,7 +52,7 @@ static struct resource sh7751_io_resource = { }; static struct resource sh7751_mem_resource = { - .name = "SH7785_mem", + .name = "SH7751_mem", .start = SH7751_PCI_MEMORY_BASE, .end = SH7751_PCI_MEMORY_BASE + SH7751_PCI_MEM_SIZE - 1, .flags = IORESOURCE_MEM @@ -64,6 +64,7 @@ static struct pci_channel sh7751_pci_controller = { .mem_offset = 0x00000000, .io_resource = &sh7751_io_resource, .io_offset = 0x00000000, + .io_map_base = SH7751_PCI_IO_BASE, }; static struct sh4_pci_address_map sh7751_pci_map = { @@ -179,8 +180,6 @@ static int __init sh7751_pci_init(void) word = SH4_PCICR_PREFIX | SH4_PCICR_CFIN | SH4_PCICR_ARBM; pci_write_reg(chan, word, SH4_PCICR); - __set_io_port_base(SH7751_PCI_IO_BASE); - register_pci_controller(chan); return 0; -- cgit v1.2.3