diff for duplicates of <1513863613.2785.6.camel@intel.com> diff --git a/a/1.txt b/N1/1.txt index 3a176a9..00bcdad 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -20,8 +20,8 @@ rui > Matthias > > > -> > drivers/thermal/mtk_thermal.c | 9 +-------- -> > 1 file changed, 1 insertion(+), 8 deletions(-) +> > ?drivers/thermal/mtk_thermal.c | 9 +-------- +> > ?1 file changed, 1 insertion(+), 8 deletions(-) > > > > diff --git a/drivers/thermal/mtk_thermal.c > > b/drivers/thermal/mtk_thermal.c @@ -29,38 +29,38 @@ rui > > --- a/drivers/thermal/mtk_thermal.c > > +++ b/drivers/thermal/mtk_thermal.c > > @@ -32,15 +32,10 @@ -> > #include <linux/types.h> -> > -> > /* AUXADC Registers */ +> > ?#include <linux/types.h> +> > ? +> > ?/* AUXADC Registers */ > > -#define AUXADC_CON0_V 0x000 > > -#define AUXADC_CON1_V 0x004 -> > #define AUXADC_CON1_SET_V 0x008 -> > #define AUXADC_CON1_CLR_V 0x00c -> > #define AUXADC_CON2_V 0x010 -> > #define AUXADC_DATA(channel) (0x14 + (channel) * 4) +> > ?#define AUXADC_CON1_SET_V 0x008 +> > ?#define AUXADC_CON1_CLR_V 0x00c +> > ?#define AUXADC_CON2_V 0x010 +> > ?#define AUXADC_DATA(channel) (0x14 + (channel) * 4) > > -#define AUXADC_MISC_V 0x094 > > - > > -#define AUXADC_CON1_CHANNEL(x) BIT(x) -> > -> > #define APMIXED_SYS_TS_CON1 0x604 -> > +> > ? +> > ?#define APMIXED_SYS_TS_CON1 0x604 +> > ? > > @@ -158,8 +153,6 @@ -> > /* The number of sensing points per bank */ -> > #define MT2712_NUM_SENSORS_PER_ZONE 4 -> > -> > -#define THERMAL_NAME "mtk-thermal" +> > ?/* The number of sensing points per bank */ +> > ?#define MT2712_NUM_SENSORS_PER_ZONE 4 +> > ? +> > -#define THERMAL_NAME????"mtk-thermal" > > - -> > struct mtk_thermal; -> > -> > struct thermal_bank_cfg { +> > ?struct mtk_thermal; +> > ? +> > ?struct thermal_bank_cfg { > > @@ -765,7 +758,7 @@ static struct platform_driver > > mtk_thermal_driver = { -> > .probe = mtk_thermal_probe, -> > .remove = mtk_thermal_remove, -> > .driver = { +> > ? .probe = mtk_thermal_probe, +> > ? .remove = mtk_thermal_remove, +> > ? .driver = { > > - .name = THERMAL_NAME, > > + .name = "mtk-thermal", -> > .of_match_table = mtk_thermal_of_match, -> > }, -> > }; +> > ? .of_match_table = mtk_thermal_of_match, +> > ? }, +> > ?}; > > diff --git a/a/content_digest b/N1/content_digest index 71a60a3..340a218 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,15 +1,9 @@ "ref\020171201104321.8410-1-matthias.bgg@gmail.com\0" "ref\0feb1e2bd-bee8-0950-7ecf-8e8c0e157f57@gmail.com\0" - "From\0Zhang Rui <rui.zhang@intel.com>\0" - "Subject\0Re: [PATCH 1/2] thermal: mtk: Cleanup unused defines\0" + "From\0rui.zhang@intel.com (Zhang Rui)\0" + "Subject\0[PATCH 1/2] thermal: mtk: Cleanup unused defines\0" "Date\0Thu, 21 Dec 2017 21:40:13 +0800\0" - "To\0Matthias Brugger <matthias.bgg@gmail.com>" - " edubezval@gmail.com\0" - "Cc\0linux-pm@vger.kernel.org" - linux-arm-kernel@lists.infradead.org - linux-mediatek@lists.infradead.org - linux-kernel@vger.kernel.org - " Matthias Brugger <mbrugger@suse.com>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On Thu, 2017-12-21 at 11:01 +0100, Matthias Brugger wrote:\n" @@ -34,8 +28,8 @@ "> Matthias\n" "> \n" "> > \n" - "> > \302\240drivers/thermal/mtk_thermal.c | 9 +--------\n" - "> > \302\2401 file changed, 1 insertion(+), 8 deletions(-)\n" + "> > ?drivers/thermal/mtk_thermal.c | 9 +--------\n" + "> > ?1 file changed, 1 insertion(+), 8 deletions(-)\n" "> > \n" "> > diff --git a/drivers/thermal/mtk_thermal.c\n" "> > b/drivers/thermal/mtk_thermal.c\n" @@ -43,40 +37,40 @@ "> > --- a/drivers/thermal/mtk_thermal.c\n" "> > +++ b/drivers/thermal/mtk_thermal.c\n" "> > @@ -32,15 +32,10 @@\n" - "> > \302\240#include <linux/types.h>\n" - "> > \302\240\n" - "> > \302\240/* AUXADC Registers */\n" + "> > ?#include <linux/types.h>\n" + "> > ?\n" + "> > ?/* AUXADC Registers */\n" "> > -#define AUXADC_CON0_V\t\t0x000\n" "> > -#define AUXADC_CON1_V\t\t0x004\n" - "> > \302\240#define AUXADC_CON1_SET_V\t0x008\n" - "> > \302\240#define AUXADC_CON1_CLR_V\t0x00c\n" - "> > \302\240#define AUXADC_CON2_V\t\t0x010\n" - "> > \302\240#define AUXADC_DATA(channel)\t(0x14 + (channel) * 4)\n" + "> > ?#define AUXADC_CON1_SET_V\t0x008\n" + "> > ?#define AUXADC_CON1_CLR_V\t0x00c\n" + "> > ?#define AUXADC_CON2_V\t\t0x010\n" + "> > ?#define AUXADC_DATA(channel)\t(0x14 + (channel) * 4)\n" "> > -#define AUXADC_MISC_V\t\t0x094\n" "> > -\n" "> > -#define AUXADC_CON1_CHANNEL(x)\tBIT(x)\n" - "> > \302\240\n" - "> > \302\240#define APMIXED_SYS_TS_CON1\t0x604\n" - "> > \302\240\n" + "> > ?\n" + "> > ?#define APMIXED_SYS_TS_CON1\t0x604\n" + "> > ?\n" "> > @@ -158,8 +153,6 @@\n" - "> > \302\240/* The number of sensing points per bank */\n" - "> > \302\240#define MT2712_NUM_SENSORS_PER_ZONE\t4\n" - "> > \302\240\n" - "> > -#define THERMAL_NAME\302\240\302\240\302\240\302\240\"mtk-thermal\"\n" + "> > ?/* The number of sensing points per bank */\n" + "> > ?#define MT2712_NUM_SENSORS_PER_ZONE\t4\n" + "> > ?\n" + "> > -#define THERMAL_NAME????\"mtk-thermal\"\n" "> > -\n" - "> > \302\240struct mtk_thermal;\n" - "> > \302\240\n" - "> > \302\240struct thermal_bank_cfg {\n" + "> > ?struct mtk_thermal;\n" + "> > ?\n" + "> > ?struct thermal_bank_cfg {\n" "> > @@ -765,7 +758,7 @@ static struct platform_driver\n" "> > mtk_thermal_driver = {\n" - "> > \302\240\t.probe = mtk_thermal_probe,\n" - "> > \302\240\t.remove = mtk_thermal_remove,\n" - "> > \302\240\t.driver = {\n" + "> > ?\t.probe = mtk_thermal_probe,\n" + "> > ?\t.remove = mtk_thermal_remove,\n" + "> > ?\t.driver = {\n" "> > -\t\t.name = THERMAL_NAME,\n" "> > +\t\t.name = \"mtk-thermal\",\n" - "> > \302\240\t\t.of_match_table = mtk_thermal_of_match,\n" - "> > \302\240\t},\n" - "> > \302\240};\n" + "> > ?\t\t.of_match_table = mtk_thermal_of_match,\n" + "> > ?\t},\n" + "> > ?};\n" > > -7ec09fb9a69bc2d680c7ef4af8a855185344c1eb89dc636a2c849d96e3e797c9 +938bee739b9efda452196c37aedc8cebad10afe25bba35d47b4ab5e35a3fd766
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.