diff for duplicates of <20160104204347.GC19867@mwanda> diff --git a/a/1.txt b/N1/1.txt index cea86dc..f3b16e8 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -9,26 +9,30 @@ index 6fa0fea..59485d0 100644 +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c @@ -843,15 +843,15 @@ static int amdgpu_cgs_acpi_eval_object(void *cgs_device, if (info->input_count > 0) { - if (info->pinput_argument = NULL) + if (info->pinput_argument == NULL) return -EINVAL; - argument = info->pinput_argument; - func_no = argument->value; - for (i = 0; i < info->input_count; i++) { -- if (((argument->type = ACPI_TYPE_STRING) || -- (argument->type = ACPI_TYPE_BUFFER)) -- && (argument->pointer = NULL)) +- if (((argument->type == ACPI_TYPE_STRING) || +- (argument->type == ACPI_TYPE_BUFFER)) +- && (argument->pointer == NULL)) - return -EINVAL; - argument++; - } + argument = info->pinput_argument; + func_no = argument->value; + for (i = 0; i < info->input_count; i++) { -+ if (((argument->type = ACPI_TYPE_STRING) || -+ (argument->type = ACPI_TYPE_BUFFER)) && -+ (argument->pointer = NULL)) ++ if (((argument->type == ACPI_TYPE_STRING) || ++ (argument->type == ACPI_TYPE_BUFFER)) && ++ (argument->pointer == NULL)) + return -EINVAL; + argument++; + } } if (info->output_count > 0) { +_______________________________________________ +dri-devel mailing list +dri-devel@lists.freedesktop.org +http://lists.freedesktop.org/mailman/listinfo/dri-devel diff --git a/a/content_digest b/N1/content_digest index b0cd851..e587c3c 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Dan Carpenter <dan.carpenter@oracle.com>\0" "Subject\0[patch] drm/amdgpu/cgs: cleanup some indenting\0" - "Date\0Mon, 04 Jan 2016 20:43:47 +0000\0" + "Date\0Mon, 4 Jan 2016 23:43:47 +0300\0" "To\0David Airlie <airlied@linux.ie>\0" "Cc\0Jammy Zhou <Jammy.Zhou@amd.com>" kernel-janitors@vger.kernel.org @@ -23,28 +23,32 @@ "+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c\n" "@@ -843,15 +843,15 @@ static int amdgpu_cgs_acpi_eval_object(void *cgs_device,\n" " \tif (info->input_count > 0) {\n" - " \t\tif (info->pinput_argument = NULL)\n" + " \t\tif (info->pinput_argument == NULL)\n" " \t\t\treturn -EINVAL;\n" "-\t\t\targument = info->pinput_argument;\n" "-\t\t\tfunc_no = argument->value;\n" "-\t\t\tfor (i = 0; i < info->input_count; i++) {\n" - "-\t\t\t\tif (((argument->type = ACPI_TYPE_STRING) ||\n" - "-\t\t\t\t\t(argument->type = ACPI_TYPE_BUFFER))\n" - "-\t\t\t\t\t&& (argument->pointer = NULL))\n" + "-\t\t\t\tif (((argument->type == ACPI_TYPE_STRING) ||\n" + "-\t\t\t\t\t(argument->type == ACPI_TYPE_BUFFER))\n" + "-\t\t\t\t\t&& (argument->pointer == NULL))\n" "-\t\t\t\t\treturn -EINVAL;\n" "-\t\t\t\targument++;\n" "-\t\t\t}\n" "+\t\targument = info->pinput_argument;\n" "+\t\tfunc_no = argument->value;\n" "+\t\tfor (i = 0; i < info->input_count; i++) {\n" - "+\t\t\tif (((argument->type = ACPI_TYPE_STRING) ||\n" - "+\t\t\t (argument->type = ACPI_TYPE_BUFFER)) &&\n" - "+\t\t\t (argument->pointer = NULL))\n" + "+\t\t\tif (((argument->type == ACPI_TYPE_STRING) ||\n" + "+\t\t\t (argument->type == ACPI_TYPE_BUFFER)) &&\n" + "+\t\t\t (argument->pointer == NULL))\n" "+\t\t\t\treturn -EINVAL;\n" "+\t\t\targument++;\n" "+\t\t}\n" " \t}\n" " \n" - " \tif (info->output_count > 0) {" + " \tif (info->output_count > 0) {\n" + "_______________________________________________\n" + "dri-devel mailing list\n" + "dri-devel@lists.freedesktop.org\n" + http://lists.freedesktop.org/mailman/listinfo/dri-devel -99014cffade32d8f710f58c9ffb7211daf06a3730f31f241372d342d6224f091 +b25ff070690922901f189fcefc304511ba7d062a2e25590b8c7b0464a536b1fe
diff --git a/a/1.txt b/N2/1.txt index cea86dc..090559e 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -9,23 +9,23 @@ index 6fa0fea..59485d0 100644 +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c @@ -843,15 +843,15 @@ static int amdgpu_cgs_acpi_eval_object(void *cgs_device, if (info->input_count > 0) { - if (info->pinput_argument = NULL) + if (info->pinput_argument == NULL) return -EINVAL; - argument = info->pinput_argument; - func_no = argument->value; - for (i = 0; i < info->input_count; i++) { -- if (((argument->type = ACPI_TYPE_STRING) || -- (argument->type = ACPI_TYPE_BUFFER)) -- && (argument->pointer = NULL)) +- if (((argument->type == ACPI_TYPE_STRING) || +- (argument->type == ACPI_TYPE_BUFFER)) +- && (argument->pointer == NULL)) - return -EINVAL; - argument++; - } + argument = info->pinput_argument; + func_no = argument->value; + for (i = 0; i < info->input_count; i++) { -+ if (((argument->type = ACPI_TYPE_STRING) || -+ (argument->type = ACPI_TYPE_BUFFER)) && -+ (argument->pointer = NULL)) ++ if (((argument->type == ACPI_TYPE_STRING) || ++ (argument->type == ACPI_TYPE_BUFFER)) && ++ (argument->pointer == NULL)) + return -EINVAL; + argument++; + } diff --git a/a/content_digest b/N2/content_digest index b0cd851..8bee8e3 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,15 +1,16 @@ "From\0Dan Carpenter <dan.carpenter@oracle.com>\0" "Subject\0[patch] drm/amdgpu/cgs: cleanup some indenting\0" - "Date\0Mon, 04 Jan 2016 20:43:47 +0000\0" + "Date\0Mon, 4 Jan 2016 23:43:47 +0300\0" "To\0David Airlie <airlied@linux.ie>\0" - "Cc\0Jammy Zhou <Jammy.Zhou@amd.com>" - kernel-janitors@vger.kernel.org - linux-kernel@vger.kernel.org - dri-devel@lists.freedesktop.org - Eric Huang <JinHuiEric.Huang@amd.com> - Alex Deucher <alexander.deucher@amd.com> + "Cc\0Alex Deucher <alexander.deucher@amd.com>" + Jammy Zhou <Jammy.Zhou@amd.com> + Chunming Zhou <david1.zhou@amd.com> Rex Zhu <Rex.Zhu@amd.com> - " Christian K\303\266nig <christian.koenig@amd.com>\0" + " Christian K\303\266nig <christian.koenig@amd.com>" + Eric Huang <JinHuiEric.Huang@amd.com> + dri-devel@lists.freedesktop.org + linux-kernel@vger.kernel.org + " kernel-janitors@vger.kernel.org\0" "\00:1\0" "b\0" "This code is indented too far. Also we normally use spaces to align if\n" @@ -23,23 +24,23 @@ "+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c\n" "@@ -843,15 +843,15 @@ static int amdgpu_cgs_acpi_eval_object(void *cgs_device,\n" " \tif (info->input_count > 0) {\n" - " \t\tif (info->pinput_argument = NULL)\n" + " \t\tif (info->pinput_argument == NULL)\n" " \t\t\treturn -EINVAL;\n" "-\t\t\targument = info->pinput_argument;\n" "-\t\t\tfunc_no = argument->value;\n" "-\t\t\tfor (i = 0; i < info->input_count; i++) {\n" - "-\t\t\t\tif (((argument->type = ACPI_TYPE_STRING) ||\n" - "-\t\t\t\t\t(argument->type = ACPI_TYPE_BUFFER))\n" - "-\t\t\t\t\t&& (argument->pointer = NULL))\n" + "-\t\t\t\tif (((argument->type == ACPI_TYPE_STRING) ||\n" + "-\t\t\t\t\t(argument->type == ACPI_TYPE_BUFFER))\n" + "-\t\t\t\t\t&& (argument->pointer == NULL))\n" "-\t\t\t\t\treturn -EINVAL;\n" "-\t\t\t\targument++;\n" "-\t\t\t}\n" "+\t\targument = info->pinput_argument;\n" "+\t\tfunc_no = argument->value;\n" "+\t\tfor (i = 0; i < info->input_count; i++) {\n" - "+\t\t\tif (((argument->type = ACPI_TYPE_STRING) ||\n" - "+\t\t\t (argument->type = ACPI_TYPE_BUFFER)) &&\n" - "+\t\t\t (argument->pointer = NULL))\n" + "+\t\t\tif (((argument->type == ACPI_TYPE_STRING) ||\n" + "+\t\t\t (argument->type == ACPI_TYPE_BUFFER)) &&\n" + "+\t\t\t (argument->pointer == NULL))\n" "+\t\t\t\treturn -EINVAL;\n" "+\t\t\targument++;\n" "+\t\t}\n" @@ -47,4 +48,4 @@ " \n" " \tif (info->output_count > 0) {" -99014cffade32d8f710f58c9ffb7211daf06a3730f31f241372d342d6224f091 +8bd89c17f305e7afe0c459b20558c8e63fd325afad03888e24f1ea531d05260f
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.