Skip to content

Commit

Permalink
MIPS: Add struct pci_ops member names to initialization
Browse files Browse the repository at this point in the history
Some instances of pci_ops initialization rely on the read/write members'
location in the struct. This is fragile and may break when adding new
members to the beginning of the struct.

[ralf@linux-mips.org: indent = with tabs for consistency.]

Signed-off-by: Rob Herring <robh@kernel.org>
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: linux-pci@vger.kernel.org
Cc: Bjorn Helgaas <bhelgaas@google.com>
Patchwork: https://patchwork.linux-mips.org/patch/8915/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  • Loading branch information
Rob Herring authored and Ralf Baechle committed Jan 16, 2015
1 parent 250215c commit 7b09777
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions arch/mips/pci/pci-bcm1480.c
Original file line number Diff line number Diff line change
Expand Up @@ -173,8 +173,8 @@ static int bcm1480_pcibios_write(struct pci_bus *bus, unsigned int devfn,
}

struct pci_ops bcm1480_pci_ops = {
bcm1480_pcibios_read,
bcm1480_pcibios_write,
.read = bcm1480_pcibios_read,
.write = bcm1480_pcibios_write,
};

static struct resource bcm1480_mem_resource = {
Expand Down
4 changes: 2 additions & 2 deletions arch/mips/pci/pci-octeon.c
Original file line number Diff line number Diff line change
Expand Up @@ -327,8 +327,8 @@ static int octeon_write_config(struct pci_bus *bus, unsigned int devfn,


static struct pci_ops octeon_pci_ops = {
octeon_read_config,
octeon_write_config,
.read = octeon_read_config,
.write = octeon_write_config,
};

static struct resource octeon_pci_mem_resource = {
Expand Down
12 changes: 6 additions & 6 deletions arch/mips/pci/pcie-octeon.c
Original file line number Diff line number Diff line change
Expand Up @@ -1792,8 +1792,8 @@ static int octeon_dummy_write_config(struct pci_bus *bus, unsigned int devfn,
}

static struct pci_ops octeon_pcie0_ops = {
octeon_pcie0_read_config,
octeon_pcie0_write_config,
.read = octeon_pcie0_read_config,
.write = octeon_pcie0_write_config,
};

static struct resource octeon_pcie0_mem_resource = {
Expand All @@ -1813,8 +1813,8 @@ static struct pci_controller octeon_pcie0_controller = {
};

static struct pci_ops octeon_pcie1_ops = {
octeon_pcie1_read_config,
octeon_pcie1_write_config,
.read = octeon_pcie1_read_config,
.write = octeon_pcie1_write_config,
};

static struct resource octeon_pcie1_mem_resource = {
Expand All @@ -1834,8 +1834,8 @@ static struct pci_controller octeon_pcie1_controller = {
};

static struct pci_ops octeon_dummy_ops = {
octeon_dummy_read_config,
octeon_dummy_write_config,
.read = octeon_dummy_read_config,
.write = octeon_dummy_write_config,
};

static struct resource octeon_dummy_mem_resource = {
Expand Down

0 comments on commit 7b09777

Please sign in to comment.