diff for duplicates of <20140705174742.GD26618@google.com> diff --git a/a/1.txt b/N1/1.txt index 66f6c57..139e9e0 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -13,16 +13,15 @@ Applied with Phil and Simon's acks to pci/host-rcar for v3.17, thanks! > 1 file changed, 10 deletions(-) > > Index: pci/drivers/pci/host/pcie-rcar.c -> =================================================================== -> --- pci.orig/drivers/pci/host/pcie-rcar.c +> =================================> --- pci.orig/drivers/pci/host/pcie-rcar.c > +++ pci/drivers/pci/host/pcie-rcar.c > @@ -260,11 +260,6 @@ static int rcar_pcie_read_conf(struct pc > struct rcar_pcie *pcie = sys_to_pcie(bus->sysdata); > int ret; > -> - if ((size == 2) && (where & 1)) +> - if ((size = 2) && (where & 1)) > - return PCIBIOS_BAD_REGISTER_NUMBER; -> - else if ((size == 4) && (where & 3)) +> - else if ((size = 4) && (where & 3)) > - return PCIBIOS_BAD_REGISTER_NUMBER; > - > ret = rcar_pcie_config_access(pcie, PCI_ACCESS_READ, @@ -32,9 +31,9 @@ Applied with Phil and Simon's acks to pci/host-rcar for v3.17, thanks! > int shift, ret; > u32 data; > -> - if ((size == 2) && (where & 1)) +> - if ((size = 2) && (where & 1)) > - return PCIBIOS_BAD_REGISTER_NUMBER; -> - else if ((size == 4) && (where & 3)) +> - else if ((size = 4) && (where & 3)) > - return PCIBIOS_BAD_REGISTER_NUMBER; > - > ret = rcar_pcie_config_access(pcie, PCI_ACCESS_READ, diff --git a/a/content_digest b/N1/content_digest index bb1fd09..465168f 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\0201406271859.13626.sergei.shtylyov@cogentembedded.com\0" "From\0Bjorn Helgaas <bhelgaas@google.com>\0" "Subject\0Re: [PATCH] pcie-rcar: kill duplicate checks\0" - "Date\0Sat, 5 Jul 2014 11:47:42 -0600\0" + "Date\0Sat, 05 Jul 2014 17:47:42 +0000\0" "To\0Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>\0" "Cc\0horms@verge.net.au" linux-pci@vger.kernel.org @@ -24,16 +24,15 @@ "> 1 file changed, 10 deletions(-)\n" "> \n" "> Index: pci/drivers/pci/host/pcie-rcar.c\n" - "> ===================================================================\n" - "> --- pci.orig/drivers/pci/host/pcie-rcar.c\n" + "> =================================> --- pci.orig/drivers/pci/host/pcie-rcar.c\n" "> +++ pci/drivers/pci/host/pcie-rcar.c\n" "> @@ -260,11 +260,6 @@ static int rcar_pcie_read_conf(struct pc\n" "> \tstruct rcar_pcie *pcie = sys_to_pcie(bus->sysdata);\n" "> \tint ret;\n" "> \n" - "> -\tif ((size == 2) && (where & 1))\n" + "> -\tif ((size = 2) && (where & 1))\n" "> -\t\treturn PCIBIOS_BAD_REGISTER_NUMBER;\n" - "> -\telse if ((size == 4) && (where & 3))\n" + "> -\telse if ((size = 4) && (where & 3))\n" "> -\t\treturn PCIBIOS_BAD_REGISTER_NUMBER;\n" "> -\n" "> \tret = rcar_pcie_config_access(pcie, PCI_ACCESS_READ,\n" @@ -43,13 +42,13 @@ "> \tint shift, ret;\n" "> \tu32 data;\n" "> \n" - "> -\tif ((size == 2) && (where & 1))\n" + "> -\tif ((size = 2) && (where & 1))\n" "> -\t\treturn PCIBIOS_BAD_REGISTER_NUMBER;\n" - "> -\telse if ((size == 4) && (where & 3))\n" + "> -\telse if ((size = 4) && (where & 3))\n" "> -\t\treturn PCIBIOS_BAD_REGISTER_NUMBER;\n" "> -\n" "> \tret = rcar_pcie_config_access(pcie, PCI_ACCESS_READ,\n" "> \t\t\t\t bus, devfn, where, &data);\n" "> \tif (ret != PCIBIOS_SUCCESSFUL)" -e5352eea9f2928683179f236ef10e8a336f9cca9c8279171f684a9e64faacafb +14d03b649a26396b27ff18cd230151e207f276ded8fcf6fce6dd95f83c98e37e
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.