diff for duplicates of <200701270204.43835.lenb@kernel.org> diff --git a/a/1.txt b/N1/1.txt index e6d4f7b..6c3ee14 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -36,8 +36,7 @@ Signed-off-by: Len Brown<len.brown@intel.com> 1 files changed, 148 insertions(+), 7 deletions(-) Index: acpi/drivers/pci/hotplug/sgi_hotplug.c -=================================================================== ---- acpi.orig/drivers/pci/hotplug/sgi_hotplug.c +=================================--- acpi.orig/drivers/pci/hotplug/sgi_hotplug.c +++ acpi/drivers/pci/hotplug/sgi_hotplug.c @@ -28,6 +28,8 @@ #include <asm/sn/sn_feature_sets.h> @@ -85,7 +84,7 @@ Index: acpi/drivers/pci/hotplug/sgi_hotplug.c + rc = sal_pcibr_slot_enable(pcibus_info, device_num, &resp, ssdt); + - if (rc == PCI_SLOT_ALREADY_UP) { + if (rc = PCI_SLOT_ALREADY_UP) { dev_dbg(slot->pci_bus->self, "is already active\n"); @@ -335,6 +341,7 @@ static int enable_slot(struct hotplug_sl int func, num_funcs; @@ -136,7 +135,7 @@ Index: acpi/drivers/pci/hotplug/sgi_hotplug.c + sn_acpi_slot_fixup(dev); + else + sn_io_slot_fixup(dev); - if (dev->hdr_type == PCI_HEADER_TYPE_BRIDGE) { + if (dev->hdr_type = PCI_HEADER_TYPE_BRIDGE) { unsigned char sec_bus; pci_read_config_byte(dev, PCI_SECONDARY_BUS, @@ -388,6 +413,63 @@ static int enable_slot(struct hotplug_sl @@ -173,7 +172,7 @@ Index: acpi/drivers/pci/hotplug/sgi_hotplug.c + phandle, chandle, + &rethandle); + -+ if (ret == AE_NOT_FOUND || rethandle == NULL) ++ if (ret = AE_NOT_FOUND || rethandle = NULL) + break; + + chandle = rethandle; @@ -182,7 +181,7 @@ Index: acpi/drivers/pci/hotplug/sgi_hotplug.c + NULL, &adr); + + if (ACPI_SUCCESS(ret) && -+ (adr>>16) == (slot->device_num + 1)) { ++ (adr>>16) = (slot->device_num + 1)) { + + ret = acpi_bus_add(&device, pdevice, chandle, + ACPI_BUS_TYPE_DEVICE); @@ -239,7 +238,7 @@ Index: acpi/drivers/pci/hotplug/sgi_hotplug.c + phandle, chandle, + &rethandle); + -+ if (ret == AE_NOT_FOUND || rethandle == NULL) ++ if (ret = AE_NOT_FOUND || rethandle = NULL) + break; + + chandle = rethandle; @@ -248,7 +247,7 @@ Index: acpi/drivers/pci/hotplug/sgi_hotplug.c + METHOD_NAME__ADR, + NULL, &adr); + if (ACPI_SUCCESS(ret) && -+ (adr>>16) == (slot->device_num + 1)) { ++ (adr>>16) = (slot->device_num + 1)) { + /* retain the owner id */ + acpi_get_id(chandle, &ssdt_id); + diff --git a/a/content_digest b/N1/content_digest index ec56991..41fe2a0 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,7 +3,7 @@ "ref\0200701270203.15772.lenb@kernel.org\0" "From\0Len Brown <lenb@kernel.org>\0" "Subject\0[PATCH 3/3] Altix: Add ACPI SSDT PCI device support (hotplug)\0" - "Date\0Sat, 27 Jan 2007 02:04:43 -0500\0" + "Date\0Sat, 27 Jan 2007 07:04:43 +0000\0" "To\0Andrew Morton <akpm@osdl.org>\0" "Cc\0John Keller <jpk@sgi.com>" linux-acpi@vger.kernel.org @@ -56,8 +56,7 @@ " 1 files changed, 148 insertions(+), 7 deletions(-)\n" "\n" "Index: acpi/drivers/pci/hotplug/sgi_hotplug.c\n" - "===================================================================\n" - "--- acpi.orig/drivers/pci/hotplug/sgi_hotplug.c\n" + "=================================--- acpi.orig/drivers/pci/hotplug/sgi_hotplug.c\n" "+++ acpi/drivers/pci/hotplug/sgi_hotplug.c\n" "@@ -28,6 +28,8 @@\n" " #include <asm/sn/sn_feature_sets.h>\n" @@ -105,7 +104,7 @@ "+\trc = sal_pcibr_slot_enable(pcibus_info, device_num, &resp, ssdt);\n" "+\n" " \n" - " \tif (rc == PCI_SLOT_ALREADY_UP) {\n" + " \tif (rc = PCI_SLOT_ALREADY_UP) {\n" " \t\tdev_dbg(slot->pci_bus->self, \"is already active\\n\");\n" "@@ -335,6 +341,7 @@ static int enable_slot(struct hotplug_sl\n" " \tint func, num_funcs;\n" @@ -156,7 +155,7 @@ "+\t\t\t\tsn_acpi_slot_fixup(dev);\n" "+\t\t\telse\n" "+\t\t\t\tsn_io_slot_fixup(dev);\n" - " \t\t\tif (dev->hdr_type == PCI_HEADER_TYPE_BRIDGE) {\n" + " \t\t\tif (dev->hdr_type = PCI_HEADER_TYPE_BRIDGE) {\n" " \t\t\t\tunsigned char sec_bus;\n" " \t\t\t\tpci_read_config_byte(dev, PCI_SECONDARY_BUS,\n" "@@ -388,6 +413,63 @@ static int enable_slot(struct hotplug_sl\n" @@ -193,7 +192,7 @@ "+\t\t\t\t\t\t phandle, chandle,\n" "+\t\t\t\t\t\t &rethandle);\n" "+\n" - "+\t\t\tif (ret == AE_NOT_FOUND || rethandle == NULL)\n" + "+\t\t\tif (ret = AE_NOT_FOUND || rethandle = NULL)\n" "+\t\t\t\tbreak;\n" "+\n" "+\t\t\tchandle = rethandle;\n" @@ -202,7 +201,7 @@ "+\t\t\t\t\t\t NULL, &adr);\n" "+\n" "+\t\t\tif (ACPI_SUCCESS(ret) &&\n" - "+\t\t\t (adr>>16) == (slot->device_num + 1)) {\n" + "+\t\t\t (adr>>16) = (slot->device_num + 1)) {\n" "+\n" "+\t\t\t\tret = acpi_bus_add(&device, pdevice, chandle,\n" "+\t\t\t\t\t\t ACPI_BUS_TYPE_DEVICE);\n" @@ -259,7 +258,7 @@ "+\t\t\t\t\t\t phandle, chandle,\n" "+\t\t\t\t\t\t &rethandle);\n" "+\n" - "+\t\t\tif (ret == AE_NOT_FOUND || rethandle == NULL)\n" + "+\t\t\tif (ret = AE_NOT_FOUND || rethandle = NULL)\n" "+\t\t\t\tbreak;\n" "+\n" "+\t\t\tchandle = rethandle;\n" @@ -268,7 +267,7 @@ "+\t\t\t\t\t\t METHOD_NAME__ADR,\n" "+\t\t\t\t\t\t NULL, &adr);\n" "+\t\t\tif (ACPI_SUCCESS(ret) &&\n" - "+\t\t\t (adr>>16) == (slot->device_num + 1)) {\n" + "+\t\t\t (adr>>16) = (slot->device_num + 1)) {\n" "+\t\t\t\t/* retain the owner id */\n" "+\t\t\t\tacpi_get_id(chandle, &ssdt_id);\n" "+\n" @@ -303,4 +302,4 @@ " \t/* free the collected sysdata pointers */\n" " \tsn_bus_free_sysdata();" -ad66c5e03220b394f68818973d0abb9424449fe036865090d81503483e0945d8 +401d16b71a3664f8fcafa7aba9ce6c0f478f644d5fb61b924c2d40e8b486ffd1
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.