diff for duplicates of <20140424191901.GE29593@google.com> diff --git a/a/1.txt b/N1/1.txt index e9678c7..faf6764 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -133,7 +133,7 @@ PCI_SLOT(), and PCI_FUNC(). > + PCIE_CONF_FUNC(func) | reg, PCIECAR); > + > + /* Enable the configuration access */ -> + if (bus->parent->number == pcie->root_bus_nr) +> + if (bus->parent->number = pcie->root_bus_nr) > + pci_write_reg(pcie, CONFIG_SEND_ENABLE | TYPE0, PCIECCTLR); > + else > + pci_write_reg(pcie, CONFIG_SEND_ENABLE | TYPE1, PCIECCTLR); @@ -147,7 +147,7 @@ PCI_SLOT(), and PCI_FUNC(). > + (PCI_STATUS_REC_MASTER_ABORT | PCI_STATUS_REC_TARGET_ABORT)) > + return PCIBIOS_DEVICE_NOT_FOUND; > + -> + if (access_type == PCI_ACCESS_READ) +> + if (access_type = PCI_ACCESS_READ) > + *data = pci_read_reg(pcie, PCIECDR); > + else > + pci_write_reg(pcie, *data, PCIECDR); diff --git a/a/content_digest b/N1/content_digest index ec425cb..e842421 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,15 +2,8 @@ "ref\01396261856-22465-2-git-send-email-phil.edworthy@renesas.com\0" "From\0Bjorn Helgaas <bhelgaas@google.com>\0" "Subject\0Re: [PATCH v7 01/10] PCI: host: rcar: Add Renesas R-Car PCIe driver\0" - "Date\0Thu, 24 Apr 2014 13:19:01 -0600\0" - "To\0Phil Edworthy <phil.edworthy@renesas.com>\0" - "Cc\0linux-pci@vger.kernel.org" - linux-sh@vger.kernel.org - LAKML <linux-arm-kernel@lists.infradead.org> - Valentine Barshak <valentine.barshak@cogentembedded.com> - Simon Horman <horms@verge.net.au> - Magnus Damm <magnus.damm@gmail.com> - " Ben Dooks <ben.dooks@codethink.co.uk>\0" + "Date\0Thu, 24 Apr 2014 19:19:01 +0000\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On Mon, Mar 31, 2014 at 11:30:46AM +0100, Phil Edworthy wrote:\n" @@ -148,7 +141,7 @@ "> +\t\t\t\tPCIE_CONF_FUNC(func) | reg, PCIECAR);\n" "> +\n" "> +\t/* Enable the configuration access */\n" - "> +\tif (bus->parent->number == pcie->root_bus_nr)\n" + "> +\tif (bus->parent->number = pcie->root_bus_nr)\n" "> +\t\tpci_write_reg(pcie, CONFIG_SEND_ENABLE | TYPE0, PCIECCTLR);\n" "> +\telse\n" "> +\t\tpci_write_reg(pcie, CONFIG_SEND_ENABLE | TYPE1, PCIECCTLR);\n" @@ -162,7 +155,7 @@ "> +\t\t(PCI_STATUS_REC_MASTER_ABORT | PCI_STATUS_REC_TARGET_ABORT))\n" "> +\t\treturn PCIBIOS_DEVICE_NOT_FOUND;\n" "> +\n" - "> +\tif (access_type == PCI_ACCESS_READ)\n" + "> +\tif (access_type = PCI_ACCESS_READ)\n" "> +\t\t*data = pci_read_reg(pcie, PCIECDR);\n" "> +\telse\n" "> +\t\tpci_write_reg(pcie, *data, PCIECDR);\n" @@ -227,4 +220,4 @@ "\n" Bjorn -188ca6ec7525056c3b17edd2763fa2e1fe5de648a3485b84226d57ba35779c9c +dade0c3956da24f722f5b4ae7444d42ed5e9ade0aa29dc10216c3448513c1c81
diff --git a/a/content_digest b/N2/content_digest index ec425cb..f2708cd 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,16 +1,9 @@ "ref\01396261856-22465-1-git-send-email-phil.edworthy@renesas.com\0" "ref\01396261856-22465-2-git-send-email-phil.edworthy@renesas.com\0" - "From\0Bjorn Helgaas <bhelgaas@google.com>\0" - "Subject\0Re: [PATCH v7 01/10] PCI: host: rcar: Add Renesas R-Car PCIe driver\0" + "From\0bhelgaas@google.com (Bjorn Helgaas)\0" + "Subject\0[PATCH v7 01/10] PCI: host: rcar: Add Renesas R-Car PCIe driver\0" "Date\0Thu, 24 Apr 2014 13:19:01 -0600\0" - "To\0Phil Edworthy <phil.edworthy@renesas.com>\0" - "Cc\0linux-pci@vger.kernel.org" - linux-sh@vger.kernel.org - LAKML <linux-arm-kernel@lists.infradead.org> - Valentine Barshak <valentine.barshak@cogentembedded.com> - Simon Horman <horms@verge.net.au> - Magnus Damm <magnus.damm@gmail.com> - " Ben Dooks <ben.dooks@codethink.co.uk>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On Mon, Mar 31, 2014 at 11:30:46AM +0100, Phil Edworthy wrote:\n" @@ -227,4 +220,4 @@ "\n" Bjorn -188ca6ec7525056c3b17edd2763fa2e1fe5de648a3485b84226d57ba35779c9c +c2a303645f4d1e092bd56d60e97915b5829374e1b1d458ba177323b5799201fe
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.