diff for duplicates of <20130114184706.GA3383@gmail.com> diff --git a/a/1.txt b/N1/1.txt index dcb639c..2bf290e 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -19,7 +19,7 @@ Thanks Bjorn, so do you think a patch like the following would be better? - cong -From 5c4798565320b2eeda23b68fdf950322f4ea66ff Mon Sep 17 00:00:00 2001 +>From 5c4798565320b2eeda23b68fdf950322f4ea66ff Mon Sep 17 00:00:00 2001 From: Cong Ding <dinggnu@gmail.com> Date: Mon, 14 Jan 2013 18:41:24 +0000 Subject: [PATCH] ia64: sn/pci/pcibr/pcibr_reg.c: remove unnecessary null pointer check @@ -301,10 +301,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); @@ -312,10 +314,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 c3bb538..4bc9a01 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -33,7 +33,7 @@ "\n" "- cong\n" "\n" - "From 5c4798565320b2eeda23b68fdf950322f4ea66ff Mon Sep 17 00:00:00 2001\n" + ">From 5c4798565320b2eeda23b68fdf950322f4ea66ff Mon Sep 17 00:00:00 2001\n" "From: Cong Ding <dinggnu@gmail.com>\n" "Date: Mon, 14 Jan 2013 18:41:24 +0000\n" "Subject: [PATCH] ia64: sn/pci/pcibr/pcibr_reg.c: remove unnecessary null pointer check\n" @@ -315,10 +315,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" @@ -326,10 +328,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" @@ -402,4 +406,4 @@ "-- \n" 1.7.4.5 -97bf146ffcc6859196be379a7bd5e4938df231cd048e8dd2439a5afc26b1414b +d1e6793dccfba538b635f9b7b65dbe11b6f708c9cf32b2a689352a827d6ffedd
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.