diff for duplicates of <20100829235551.41f64af5@debxo> diff --git a/a/1.txt b/N1/1.txt index b868567..157c396 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -133,7 +133,7 @@ index 33e31ce..51296a6 100644 -extern int prom_getintdefault(int node, char *property, int defval); +extern int prom_getintdefault(phandle node, char *property, int defval); - /* Acquire a boolean property, 0úLSE 1=TRUE. */ + /* Acquire a boolean property, 0=FALSE 1=TRUE. */ -extern int prom_getbool(int node, char *prop); +extern int prom_getbool(phandle node, char *prop); @@ -259,7 +259,7 @@ index 3e0b2d6..c9cc078 100644 -extern int prom_getintdefault(int node, const char *property, int defval); +extern int prom_getintdefault(phandle node, const char *property, int defval); - /* Acquire a boolean property, 0úLSE 1=TRUE. */ + /* Acquire a boolean property, 0=FALSE 1=TRUE. */ -extern int prom_getbool(int node, const char *prop); +extern int prom_getbool(phandle node, const char *prop); @@ -538,7 +538,7 @@ index b0b43aa..92319aa 100644 @@ -2082,7 +2084,7 @@ static void __init get_srmmu_type(void) /* Next check for Fujitsu Swift. */ - if(psr_typ = 0 && psr_vers = 4) { + if(psr_typ == 0 && psr_vers == 4) { - int cpunode; + phandle cpunode; char node_str[128]; @@ -681,7 +681,7 @@ index b21592f..63e08e1 100644 - int cnode; + phandle cnode; - if (node = -1) + if (node == -1) return 0; @@ -52,10 +52,10 @@ int prom_getchild(int node) EXPORT_SYMBOL(prom_getchild); @@ -706,7 +706,7 @@ index b21592f..63e08e1 100644 - int sibnode; + phandle sibnode; - if (node = -1) + if (node == -1) return 0; @@ -86,7 +86,7 @@ EXPORT_SYMBOL(prom_getsibling); /* Return the length in bytes of property 'prop' at node 'node'. @@ -747,7 +747,7 @@ index b21592f..63e08e1 100644 @@ -152,7 +152,7 @@ int prom_getintdefault(int node, char *property, int deflt) EXPORT_SYMBOL(prom_getintdefault); - /* Acquire a boolean property, 1=TRUE 0úLSE. */ + /* Acquire a boolean property, 1=TRUE 0=FALSE. */ -int prom_getbool(int node, char *prop) +int prom_getbool(phandle node, char *prop) { @@ -801,7 +801,7 @@ index b21592f..63e08e1 100644 -char * prom_firstprop(int node, char *bufer) +char *prom_firstprop(phandle node, char *bufer) { - if (node = 0 || node = -1) + if (node == 0 || node == -1) return ""; @@ -241,7 +242,7 @@ EXPORT_SYMBOL(prom_firstprop); * at node 'node' . Returns empty string if no more @@ -810,7 +810,7 @@ index b21592f..63e08e1 100644 -char * prom_nextprop(int node, char *oprop, char *buffer) +char *prom_nextprop(phandle node, char *oprop, char *buffer) { - if (node = 0 || node = -1) + if (node == 0 || node == -1) return ""; @@ -250,11 +251,11 @@ char * prom_nextprop(int node, char *oprop, char *buffer) } @@ -868,7 +868,7 @@ index b21592f..63e08e1 100644 + int inst; inst = prom_devopen (path); - if (inst = -1) return 0; + if (inst == -1) return 0; diff --git a/arch/sparc/prom/tree_64.c b/arch/sparc/prom/tree_64.c index 9d3f913..691be68 100644 --- a/arch/sparc/prom/tree_64.c @@ -905,7 +905,7 @@ index 9d3f913..691be68 100644 - int cnode; + phandle cnode; - if (node = -1) + if (node == -1) return 0; @@ -52,9 +52,9 @@ inline int prom_getchild(int node) } @@ -917,7 +917,7 @@ index 9d3f913..691be68 100644 - int cnode; + phandle cnode; - if (node = -1) + if (node == -1) return 0; @@ -67,14 +67,14 @@ inline int prom_getparent(int node) /* Return the next sibling of node 'node' or zero if no more siblings @@ -935,7 +935,7 @@ index 9d3f913..691be68 100644 - int sibnode; + phandle sibnode; - if (node = -1) + if (node == -1) return 0; @@ -89,7 +89,7 @@ EXPORT_SYMBOL(prom_getsibling); /* Return the length in bytes of property 'prop' at node 'node'. @@ -976,7 +976,7 @@ index 9d3f913..691be68 100644 @@ -169,7 +169,7 @@ int prom_getintdefault(int node, const char *property, int deflt) EXPORT_SYMBOL(prom_getintdefault); - /* Acquire a boolean property, 1=TRUE 0úLSE. */ + /* Acquire a boolean property, 1=TRUE 0=FALSE. */ -int prom_getbool(int node, const char *prop) +int prom_getbool(phandle node, const char *prop) { @@ -1087,7 +1087,7 @@ index 9d3f913..691be68 100644 + int inst; inst = prom_devopen (path); - if (inst = 0) + if (inst == 0) diff --git a/drivers/sbus/char/jsflash.c b/drivers/sbus/char/jsflash.c index 4942050..5139371 100644 --- a/drivers/sbus/char/jsflash.c diff --git a/a/content_digest b/N1/content_digest index 79c817e..661530d 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\020100829235100.6dcedcb8@debxo\0" "From\0Andres Salomon <dilinger@queued.net>\0" "Subject\0[PATCH 2/9] sparc: convert various prom_* functions to use phandle\0" - "Date\0Mon, 30 Aug 2010 03:55:51 +0000\0" + "Date\0Sun, 29 Aug 2010 23:55:51 -0400\0" "To\0devicetree-discuss@lists.ozlabs.org\0" "Cc\0sparclinux@vger.kernel.org" x86@kernel.org @@ -153,7 +153,7 @@ "-extern int prom_getintdefault(int node, char *property, int defval);\n" "+extern int prom_getintdefault(phandle node, char *property, int defval);\n" " \n" - " /* Acquire a boolean property, 0\303\272LSE 1=TRUE. */\n" + " /* Acquire a boolean property, 0=FALSE 1=TRUE. */\n" "-extern int prom_getbool(int node, char *prop);\n" "+extern int prom_getbool(phandle node, char *prop);\n" " \n" @@ -279,7 +279,7 @@ "-extern int prom_getintdefault(int node, const char *property, int defval);\n" "+extern int prom_getintdefault(phandle node, const char *property, int defval);\n" " \n" - " /* Acquire a boolean property, 0\303\272LSE 1=TRUE. */\n" + " /* Acquire a boolean property, 0=FALSE 1=TRUE. */\n" "-extern int prom_getbool(int node, const char *prop);\n" "+extern int prom_getbool(phandle node, const char *prop);\n" " \n" @@ -558,7 +558,7 @@ "@@ -2082,7 +2084,7 @@ static void __init get_srmmu_type(void)\n" " \n" " \t/* Next check for Fujitsu Swift. */\n" - " \tif(psr_typ = 0 && psr_vers = 4) {\n" + " \tif(psr_typ == 0 && psr_vers == 4) {\n" "-\t\tint cpunode;\n" "+\t\tphandle cpunode;\n" " \t\tchar node_str[128];\n" @@ -701,7 +701,7 @@ "-\tint cnode;\n" "+\tphandle cnode;\n" " \n" - " \tif (node = -1)\n" + " \tif (node == -1)\n" " \t\treturn 0;\n" "@@ -52,10 +52,10 @@ int prom_getchild(int node)\n" " EXPORT_SYMBOL(prom_getchild);\n" @@ -726,7 +726,7 @@ "-\tint sibnode;\n" "+\tphandle sibnode;\n" " \n" - " \tif (node = -1)\n" + " \tif (node == -1)\n" " \t\treturn 0;\n" "@@ -86,7 +86,7 @@ EXPORT_SYMBOL(prom_getsibling);\n" " /* Return the length in bytes of property 'prop' at node 'node'.\n" @@ -767,7 +767,7 @@ "@@ -152,7 +152,7 @@ int prom_getintdefault(int node, char *property, int deflt)\n" " EXPORT_SYMBOL(prom_getintdefault);\n" " \n" - " /* Acquire a boolean property, 1=TRUE 0\303\272LSE. */\n" + " /* Acquire a boolean property, 1=TRUE 0=FALSE. */\n" "-int prom_getbool(int node, char *prop)\n" "+int prom_getbool(phandle node, char *prop)\n" " {\n" @@ -821,7 +821,7 @@ "-char * prom_firstprop(int node, char *bufer)\n" "+char *prom_firstprop(phandle node, char *bufer)\n" " {\n" - " \tif (node = 0 || node = -1)\n" + " \tif (node == 0 || node == -1)\n" " \t\treturn \"\";\n" "@@ -241,7 +242,7 @@ EXPORT_SYMBOL(prom_firstprop);\n" " * at node 'node' . Returns empty string if no more\n" @@ -830,7 +830,7 @@ "-char * prom_nextprop(int node, char *oprop, char *buffer)\n" "+char *prom_nextprop(phandle node, char *oprop, char *buffer)\n" " {\n" - " \tif (node = 0 || node = -1)\n" + " \tif (node == 0 || node == -1)\n" " \t\treturn \"\";\n" "@@ -250,11 +251,11 @@ char * prom_nextprop(int node, char *oprop, char *buffer)\n" " }\n" @@ -888,7 +888,7 @@ "+\tint inst;\n" " \t\n" " \tinst = prom_devopen (path);\n" - " \tif (inst = -1) return 0;\n" + " \tif (inst == -1) return 0;\n" "diff --git a/arch/sparc/prom/tree_64.c b/arch/sparc/prom/tree_64.c\n" "index 9d3f913..691be68 100644\n" "--- a/arch/sparc/prom/tree_64.c\n" @@ -925,7 +925,7 @@ "-\tint cnode;\n" "+\tphandle cnode;\n" " \n" - " \tif (node = -1)\n" + " \tif (node == -1)\n" " \t\treturn 0;\n" "@@ -52,9 +52,9 @@ inline int prom_getchild(int node)\n" " }\n" @@ -937,7 +937,7 @@ "-\tint cnode;\n" "+\tphandle cnode;\n" " \n" - " \tif (node = -1)\n" + " \tif (node == -1)\n" " \t\treturn 0;\n" "@@ -67,14 +67,14 @@ inline int prom_getparent(int node)\n" " /* Return the next sibling of node 'node' or zero if no more siblings\n" @@ -955,7 +955,7 @@ "-\tint sibnode;\n" "+\tphandle sibnode;\n" " \n" - " \tif (node = -1)\n" + " \tif (node == -1)\n" " \t\treturn 0;\n" "@@ -89,7 +89,7 @@ EXPORT_SYMBOL(prom_getsibling);\n" " /* Return the length in bytes of property 'prop' at node 'node'.\n" @@ -996,7 +996,7 @@ "@@ -169,7 +169,7 @@ int prom_getintdefault(int node, const char *property, int deflt)\n" " EXPORT_SYMBOL(prom_getintdefault);\n" " \n" - " /* Acquire a boolean property, 1=TRUE 0\303\272LSE. */\n" + " /* Acquire a boolean property, 1=TRUE 0=FALSE. */\n" "-int prom_getbool(int node, const char *prop)\n" "+int prom_getbool(phandle node, const char *prop)\n" " {\n" @@ -1107,7 +1107,7 @@ "+\tint inst;\n" " \n" " \tinst = prom_devopen (path);\n" - " \tif (inst = 0)\n" + " \tif (inst == 0)\n" "diff --git a/drivers/sbus/char/jsflash.c b/drivers/sbus/char/jsflash.c\n" "index 4942050..5139371 100644\n" "--- a/drivers/sbus/char/jsflash.c\n" @@ -1138,4 +1138,4 @@ "-- \n" 1.5.6.5 -2c0ad00dc3d227f5484e71cbd66c64dd67f5c6554ee2acd5d888150167e2c95f +2b9c14ecc88eaad76314a9bd46986fea50d6457c47ed6e24a5d7d80dd65fff2f
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.