diff for duplicates of <4B976B49.9090502@jp.fujitsu.com> diff --git a/a/1.txt b/N1/1.txt index bad67cf..16813e9 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -52,9 +52,9 @@ Bjorn Helgaas wrote: > struct acpi_pci_root *root; > > list_for_each_entry(root, &acpi_pci_roots, node) -> - if ((root->segment == (u16) seg) && (root->bus_nr == (u16) bus)) -> + if ((root->segment == (u16) seg) && -> + (root->secondary.start == (u16) bus)) +> - if ((root->segment = (u16) seg) && (root->bus_nr = (u16) bus)) +> + if ((root->segment = (u16) seg) && +> + (root->secondary.start = (u16) bus)) > return root->device->handle; > return NULL; > } @@ -71,9 +71,9 @@ Bjorn Helgaas wrote: > > acpi_resource_to_address64(resource, &address); > if ((address.address_length > 0) && -> - (address.resource_type == ACPI_BUS_NUMBER_RANGE)) +> - (address.resource_type = ACPI_BUS_NUMBER_RANGE)) > - *busnr = address.minimum; -> + (address.resource_type == ACPI_BUS_NUMBER_RANGE)) { +> + (address.resource_type = ACPI_BUS_NUMBER_RANGE)) { > + res->start = address.minimum; > + res->end = address.minimum + address.address_length - 1; > + } @@ -90,15 +90,14 @@ Bjorn Helgaas wrote: > > - busnum = -1; > + res->start = -1; -> status = -> acpi_walk_resources(handle, METHOD_NAME__CRS, +> status > acpi_walk_resources(handle, METHOD_NAME__CRS, > - get_root_bridge_busnr_callback, &busnum); > + get_root_bridge_busnr_callback, res); > if (ACPI_FAILURE(status)) > return status; > - /* Check if we really get a bus number from _CRS */ -> - if (busnum == -1) -> + if (res->start == -1) +> - if (busnum = -1) +> + if (res->start = -1) > return AE_ERROR; > - *bus = busnum; > return AE_OK; @@ -144,7 +143,7 @@ Bjorn Helgaas wrote: > - return -ENODEV; > + if (ACPI_SUCCESS(status)) > + root->secondary.start = bus; -> + else if (status == AE_NOT_FOUND) +> + else if (status = AE_NOT_FOUND) > + root->secondary.start = 0; > + else { > + printk(KERN_ERR PREFIX "can't evaluate _BBN\n"); diff --git a/a/content_digest b/N1/content_digest index e062cbc..98b32f4 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\020100309225325.27167.60539.stgit@bob.kio\0" "From\0Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>\0" "Subject\0Re: [PATCH v3 1/2] ACPI: pci_root: save downstream bus range\0" - "Date\0Wed, 10 Mar 2010 18:50:01 +0900\0" + "Date\0Wed, 10 Mar 2010 09:50:01 +0000\0" "To\0Bjorn Helgaas <bjorn.helgaas@hp.com>\0" "Cc\0Len Brown <lenb@kernel.org>" linux-acpi@vger.kernel.org @@ -64,9 +64,9 @@ "> \tstruct acpi_pci_root *root;\n" "> \t\n" "> \tlist_for_each_entry(root, &acpi_pci_roots, node)\n" - "> -\t\tif ((root->segment == (u16) seg) && (root->bus_nr == (u16) bus))\n" - "> +\t\tif ((root->segment == (u16) seg) &&\n" - "> +\t\t (root->secondary.start == (u16) bus))\n" + "> -\t\tif ((root->segment = (u16) seg) && (root->bus_nr = (u16) bus))\n" + "> +\t\tif ((root->segment = (u16) seg) &&\n" + "> +\t\t (root->secondary.start = (u16) bus))\n" "> \t\t\treturn root->device->handle;\n" "> \treturn NULL;\t\t\n" "> }\n" @@ -83,9 +83,9 @@ "> \n" "> \tacpi_resource_to_address64(resource, &address);\n" "> \tif ((address.address_length > 0) &&\n" - "> -\t (address.resource_type == ACPI_BUS_NUMBER_RANGE))\n" + "> -\t (address.resource_type = ACPI_BUS_NUMBER_RANGE))\n" "> -\t\t*busnr = address.minimum;\n" - "> +\t (address.resource_type == ACPI_BUS_NUMBER_RANGE)) {\n" + "> +\t (address.resource_type = ACPI_BUS_NUMBER_RANGE)) {\n" "> +\t\tres->start = address.minimum;\n" "> +\t\tres->end = address.minimum + address.address_length - 1;\n" "> +\t}\n" @@ -102,15 +102,14 @@ "> \n" "> -\tbusnum = -1;\n" "> +\tres->start = -1;\n" - "> \tstatus =\n" - "> \t acpi_walk_resources(handle, METHOD_NAME__CRS,\n" + "> \tstatus > \t acpi_walk_resources(handle, METHOD_NAME__CRS,\n" "> -\t\t\t\tget_root_bridge_busnr_callback, &busnum);\n" "> +\t\t\t\tget_root_bridge_busnr_callback, res);\n" "> \tif (ACPI_FAILURE(status))\n" "> \t\treturn status;\n" "> -\t/* Check if we really get a bus number from _CRS */\n" - "> -\tif (busnum == -1)\n" - "> +\tif (res->start == -1)\n" + "> -\tif (busnum = -1)\n" + "> +\tif (res->start = -1)\n" "> \t\treturn AE_ERROR;\n" "> -\t*bus = busnum;\n" "> \treturn AE_OK;\n" @@ -156,7 +155,7 @@ "> -\t\t\treturn -ENODEV;\n" "> +\t\tif (ACPI_SUCCESS(status))\n" "> +\t\t\troot->secondary.start = bus;\n" - "> +\t\telse if (status == AE_NOT_FOUND)\n" + "> +\t\telse if (status = AE_NOT_FOUND)\n" "> +\t\t\troot->secondary.start = 0;\n" "> +\t\telse {\n" "> +\t\t\tprintk(KERN_ERR PREFIX \"can't evaluate _BBN\\n\");\n" @@ -223,4 +222,4 @@ "> \n" > -bbb78ef1ccd84e032cc02c8d0283543a74dfb50f21b3a2be5ff9ffff788a6a76 +129ee4142d7bce8452f0c27ea192b028b14f4bd8d109300ecb33cab2fc356f26
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.