Skip to content

Commit

Permalink
sh: pci-sh7751: Initialize io_map_base in controller definition.
Browse files Browse the repository at this point in the history
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 <lethal@linux-sh.org>
  • Loading branch information
Paul Mundt committed May 26, 2009
1 parent f9e2b97 commit d076d2b
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions arch/sh/drivers/pci/pci-sh7751.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 = {
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit d076d2b

Please sign in to comment.