diff for duplicates of <20130114205604.GA7066@gmail.com> diff --git a/a/1.txt b/N1/1.txt index 30a677c..4914d05 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -303,10 +303,12 @@ index 8b8bbd5..ae16be3c 100644 - if (pcibus_info) { - switch (pcibus_info->pbi_bridge_type) { - case PCIBR_BRIDGETYPE_TIOCP: -- ret - __sn_readq_relaxed(&ptr->tio.cp_wr_req_buf[device]); +- ret = +- __sn_readq_relaxed(&ptr->tio.cp_wr_req_buf[device]); - break; - case PCIBR_BRIDGETYPE_PIC: -- ret - __sn_readq_relaxed(&ptr->pic.p_wr_req_buf[device]); +- ret = +- __sn_readq_relaxed(&ptr->pic.p_wr_req_buf[device]); - break; - default: - panic("pcireg_wrb_flush_get: unknown bridgetype bridge 0x%p", ptr); @@ -314,10 +316,12 @@ index 8b8bbd5..ae16be3c 100644 - + switch (pcibus_info->pbi_bridge_type) { + case PCIBR_BRIDGETYPE_TIOCP: -+ ret + __sn_readq_relaxed(&ptr->tio.cp_wr_req_buf[device]); ++ ret = ++ __sn_readq_relaxed(&ptr->tio.cp_wr_req_buf[device]); + break; + case PCIBR_BRIDGETYPE_PIC: -+ ret + __sn_readq_relaxed(&ptr->pic.p_wr_req_buf[device]); ++ ret = ++ __sn_readq_relaxed(&ptr->pic.p_wr_req_buf[device]); + break; + default: + panic("pcireg_wrb_flush_get: unknown bridgetype bridge 0x%p", diff --git a/a/content_digest b/N1/content_digest index 8c9b206..5bd0795 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -4,7 +4,7 @@ "ref\0CAErSpo5zhQijO_-GfFnRt3zaWgcuC7F1uaGi+eEBoxnyczdZvg@mail.gmail.com\0" "From\0Cong Ding <dinggnu@gmail.com>\0" "Subject\0[PATCH v2] ia64: sn/pci/pcibr/pcibr_reg.c: remove unnecessary check null pointer\0" - "Date\0Mon, 14 Jan 2013 20:56:04 +0000\0" + "Date\0Mon, 14 Jan 2013 21:56:04 +0100\0" "To\0Bjorn Helgaas <bhelgaas@google.com>\0" "Cc\0Tony Luck <tony.luck@intel.com>" Fenghua Yu <fenghua.yu@intel.com> @@ -318,10 +318,12 @@ "-\tif (pcibus_info) {\n" "-\t\tswitch (pcibus_info->pbi_bridge_type) {\n" "-\t\tcase PCIBR_BRIDGETYPE_TIOCP:\n" - "-\t\t\tret -\t\t\t __sn_readq_relaxed(&ptr->tio.cp_wr_req_buf[device]);\n" + "-\t\t\tret =\n" + "-\t\t\t __sn_readq_relaxed(&ptr->tio.cp_wr_req_buf[device]);\n" "-\t\t\tbreak;\n" "-\t\tcase PCIBR_BRIDGETYPE_PIC:\n" - "-\t\t\tret -\t\t\t __sn_readq_relaxed(&ptr->pic.p_wr_req_buf[device]);\n" + "-\t\t\tret =\n" + "-\t\t\t __sn_readq_relaxed(&ptr->pic.p_wr_req_buf[device]);\n" "-\t\t\tbreak;\n" "-\t\tdefault:\n" "-\t\t panic(\"pcireg_wrb_flush_get: unknown bridgetype bridge 0x%p\", ptr);\n" @@ -329,10 +331,12 @@ "-\n" "+\tswitch (pcibus_info->pbi_bridge_type) {\n" "+\tcase PCIBR_BRIDGETYPE_TIOCP:\n" - "+\t\tret +\t\t __sn_readq_relaxed(&ptr->tio.cp_wr_req_buf[device]);\n" + "+\t\tret =\n" + "+\t\t __sn_readq_relaxed(&ptr->tio.cp_wr_req_buf[device]);\n" "+\t\tbreak;\n" "+\tcase PCIBR_BRIDGETYPE_PIC:\n" - "+\t\tret +\t\t __sn_readq_relaxed(&ptr->pic.p_wr_req_buf[device]);\n" + "+\t\tret =\n" + "+\t\t __sn_readq_relaxed(&ptr->pic.p_wr_req_buf[device]);\n" "+\t\tbreak;\n" "+\tdefault:\n" "+\t panic(\"pcireg_wrb_flush_get: unknown bridgetype bridge 0x%p\",\n" @@ -405,4 +409,4 @@ "-- \n" 1.7.4.5 -aa050371e41d0357488c0cf66a4c932f7c9dc19d2bb6c5f8686c7628d1109876 +6214c67ed53e1dd0ccf0b4975aba308c4325458359bbce40e8dfcd5f9984e78a
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.