diff for duplicates of <20200629202926.GA3732655@xps15> diff --git a/a/1.txt b/N1/1.txt index 7a23764..d4b202a 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -43,7 +43,7 @@ Mathieu > +{ > + int ret; > + -> + if (drvdata->ctidev.cpu = -1) +> + if (drvdata->ctidev.cpu == -1) > + return 0; > + > + if (nr_cti_cpu) @@ -77,9 +77,9 @@ Mathieu > static void cti_pm_release(struct cti_drvdata *drvdata) > { > - if (drvdata->ctidev.cpu >= 0) { -> - if (--nr_cti_cpu = 0) { +> - if (--nr_cti_cpu == 0) { > - cpu_pm_unregister_notifier(&cti_cpu_pm_nb); -> + if (drvdata->ctidev.cpu = -1) +> + if (drvdata->ctidev.cpu == -1) > + return; > > - cpuhp_remove_state_nocalls( @@ -87,7 +87,7 @@ Mathieu > - } > - cti_cpu_drvdata[drvdata->ctidev.cpu] = NULL; > + cti_cpu_drvdata[drvdata->ctidev.cpu] = NULL; -> + if (--nr_cti_cpu = 0) { +> + if (--nr_cti_cpu == 0) { > + cpu_pm_unregister_notifier(&cti_cpu_pm_nb); > + cpuhp_remove_state_nocalls(CPUHP_AP_ARM_CORESIGHT_CTI_STARTING); > } @@ -190,3 +190,8 @@ Mathieu > } > -- > 2.27.0 + +_______________________________________________ +linux-arm-kernel mailing list +linux-arm-kernel@lists.infradead.org +http://lists.infradead.org/mailman/listinfo/linux-arm-kernel diff --git a/a/content_digest b/N1/content_digest index b2a767c..d7ca332 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\020200617171549.GA9686@kadam\0" "From\0Mathieu Poirier <mathieu.poirier@linaro.org>\0" "Subject\0Re: [PATCH v2] coresight: cti: Fix error handling in probe\0" - "Date\0Mon, 29 Jun 2020 20:29:26 +0000\0" + "Date\0Mon, 29 Jun 2020 14:29:26 -0600\0" "To\0Dan Carpenter <dan.carpenter@oracle.com>\0" "Cc\0Suzuki K Poulose <suzuki.poulose@arm.com>" Alexander Shishkin <alexander.shishkin@linux.intel.com> @@ -58,7 +58,7 @@ "> +{\n" "> +\tint ret;\n" "> +\n" - "> +\tif (drvdata->ctidev.cpu = -1)\n" + "> +\tif (drvdata->ctidev.cpu == -1)\n" "> +\t\treturn 0;\n" "> +\n" "> +\tif (nr_cti_cpu)\n" @@ -92,9 +92,9 @@ "> static void cti_pm_release(struct cti_drvdata *drvdata)\n" "> {\n" "> -\tif (drvdata->ctidev.cpu >= 0) {\n" - "> -\t\tif (--nr_cti_cpu = 0) {\n" + "> -\t\tif (--nr_cti_cpu == 0) {\n" "> -\t\t\tcpu_pm_unregister_notifier(&cti_cpu_pm_nb);\n" - "> +\tif (drvdata->ctidev.cpu = -1)\n" + "> +\tif (drvdata->ctidev.cpu == -1)\n" "> +\t\treturn;\n" "> \n" "> -\t\t\tcpuhp_remove_state_nocalls(\n" @@ -102,7 +102,7 @@ "> -\t\t}\n" "> -\t\tcti_cpu_drvdata[drvdata->ctidev.cpu] = NULL;\n" "> +\tcti_cpu_drvdata[drvdata->ctidev.cpu] = NULL;\n" - "> +\tif (--nr_cti_cpu = 0) {\n" + "> +\tif (--nr_cti_cpu == 0) {\n" "> +\t\tcpu_pm_unregister_notifier(&cti_cpu_pm_nb);\n" "> +\t\tcpuhp_remove_state_nocalls(CPUHP_AP_ARM_CORESIGHT_CTI_STARTING);\n" "> \t}\n" @@ -204,6 +204,11 @@ "> \treturn ret;\n" "> }\n" "> -- \n" - > 2.27.0 + "> 2.27.0\n" + "\n" + "_______________________________________________\n" + "linux-arm-kernel mailing list\n" + "linux-arm-kernel@lists.infradead.org\n" + http://lists.infradead.org/mailman/listinfo/linux-arm-kernel -79bd859cbb173c56fb98359bdeae337648fc01bd702bcce5772c4d6a972a53aa +a435963def11b4c0ed80b64efb1e09d7d0b6f008abeba88893c2056204eb1b35
diff --git a/a/1.txt b/N2/1.txt index 7a23764..ba00774 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -43,7 +43,7 @@ Mathieu > +{ > + int ret; > + -> + if (drvdata->ctidev.cpu = -1) +> + if (drvdata->ctidev.cpu == -1) > + return 0; > + > + if (nr_cti_cpu) @@ -77,9 +77,9 @@ Mathieu > static void cti_pm_release(struct cti_drvdata *drvdata) > { > - if (drvdata->ctidev.cpu >= 0) { -> - if (--nr_cti_cpu = 0) { +> - if (--nr_cti_cpu == 0) { > - cpu_pm_unregister_notifier(&cti_cpu_pm_nb); -> + if (drvdata->ctidev.cpu = -1) +> + if (drvdata->ctidev.cpu == -1) > + return; > > - cpuhp_remove_state_nocalls( @@ -87,7 +87,7 @@ Mathieu > - } > - cti_cpu_drvdata[drvdata->ctidev.cpu] = NULL; > + cti_cpu_drvdata[drvdata->ctidev.cpu] = NULL; -> + if (--nr_cti_cpu = 0) { +> + if (--nr_cti_cpu == 0) { > + cpu_pm_unregister_notifier(&cti_cpu_pm_nb); > + cpuhp_remove_state_nocalls(CPUHP_AP_ARM_CORESIGHT_CTI_STARTING); > } diff --git a/a/content_digest b/N2/content_digest index b2a767c..6961875 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -2,15 +2,15 @@ "ref\020200617171549.GA9686@kadam\0" "From\0Mathieu Poirier <mathieu.poirier@linaro.org>\0" "Subject\0Re: [PATCH v2] coresight: cti: Fix error handling in probe\0" - "Date\0Mon, 29 Jun 2020 20:29:26 +0000\0" + "Date\0Mon, 29 Jun 2020 14:29:26 -0600\0" "To\0Dan Carpenter <dan.carpenter@oracle.com>\0" - "Cc\0Suzuki K Poulose <suzuki.poulose@arm.com>" + "Cc\0Mike Leach <mike.leach@linaro.org>" + Suzuki K Poulose <suzuki.poulose@arm.com> Alexander Shishkin <alexander.shishkin@linux.intel.com> Greg Kroah-Hartman <gregkh@linuxfoundation.org> - kernel-janitors@vger.kernel.org - linux-kernel@vger.kernel.org linux-arm-kernel@lists.infradead.org - " Mike Leach <mike.leach@linaro.org>\0" + linux-kernel@vger.kernel.org + " kernel-janitors@vger.kernel.org\0" "\00:1\0" "b\0" "On Wed, Jun 17, 2020 at 08:15:50PM +0300, Dan Carpenter wrote:\n" @@ -58,7 +58,7 @@ "> +{\n" "> +\tint ret;\n" "> +\n" - "> +\tif (drvdata->ctidev.cpu = -1)\n" + "> +\tif (drvdata->ctidev.cpu == -1)\n" "> +\t\treturn 0;\n" "> +\n" "> +\tif (nr_cti_cpu)\n" @@ -92,9 +92,9 @@ "> static void cti_pm_release(struct cti_drvdata *drvdata)\n" "> {\n" "> -\tif (drvdata->ctidev.cpu >= 0) {\n" - "> -\t\tif (--nr_cti_cpu = 0) {\n" + "> -\t\tif (--nr_cti_cpu == 0) {\n" "> -\t\t\tcpu_pm_unregister_notifier(&cti_cpu_pm_nb);\n" - "> +\tif (drvdata->ctidev.cpu = -1)\n" + "> +\tif (drvdata->ctidev.cpu == -1)\n" "> +\t\treturn;\n" "> \n" "> -\t\t\tcpuhp_remove_state_nocalls(\n" @@ -102,7 +102,7 @@ "> -\t\t}\n" "> -\t\tcti_cpu_drvdata[drvdata->ctidev.cpu] = NULL;\n" "> +\tcti_cpu_drvdata[drvdata->ctidev.cpu] = NULL;\n" - "> +\tif (--nr_cti_cpu = 0) {\n" + "> +\tif (--nr_cti_cpu == 0) {\n" "> +\t\tcpu_pm_unregister_notifier(&cti_cpu_pm_nb);\n" "> +\t\tcpuhp_remove_state_nocalls(CPUHP_AP_ARM_CORESIGHT_CTI_STARTING);\n" "> \t}\n" @@ -206,4 +206,4 @@ "> -- \n" > 2.27.0 -79bd859cbb173c56fb98359bdeae337648fc01bd702bcce5772c4d6a972a53aa +3c44688500bbd4f9b201470abd9bcec295e5446d30e7b6df2a53741307861e8e
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.