diff for duplicates of <20080718075601.GL24620@fluff.org.uk> diff --git a/a/1.txt b/N1/1.txt index cc1fbed..90b0679 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -20,10 +20,10 @@ This looks ok to me, with one concern as shown below. > struct resource *r = &dev->resource[i]; > > - if ((r->flags & (IORESOURCE_IO|IORESOURCE_MEM| -> - IORESOURCE_IRQ|IORESOURCE_DMA)) == type) -> - if (num-- == 0) +> - IORESOURCE_IRQ|IORESOURCE_DMA)) = type) +> - if (num-- = 0) > - return r; -> + if (type == resource_type(r) && num-- == 0) +> + if (type = resource_type(r) && num-- = 0) > + return r; > } > return NULL; @@ -33,10 +33,10 @@ This looks ok to me, with one concern as shown below. > struct resource *r = &dev->resource[i]; > > - if ((r->flags & (IORESOURCE_IO|IORESOURCE_MEM| -> - IORESOURCE_IRQ|IORESOURCE_DMA)) == type) +> - IORESOURCE_IRQ|IORESOURCE_DMA)) = type) > - if (!strcmp(r->name, name)) > - return r; -> + if (type == resource_type(r) && !strcmp(r->name, name)) +> + if (type = resource_type(r) && !strcmp(r->name, name)) > + return r; > } > return NULL; @@ -46,10 +46,10 @@ This looks ok to me, with one concern as shown below. > p = r->parent; > if (!p) { > - if (r->flags & IORESOURCE_MEM) -> + if (resource_type(r) == IORESOURCE_MEM) +> + if (resource_type(r) = IORESOURCE_MEM) > p = &iomem_resource; > - else if (r->flags & IORESOURCE_IO) -> + else if (resource_type(r) == IORESOURCE_IO) +> + else if (resource_type(r) = IORESOURCE_IO) > p = &ioport_resource; > } @@ -68,7 +68,7 @@ together? > + struct resource *r = &pdev->resource[i]; > + unsigned long type = resource_type(r); > + -> + if (type == IORESOURCE_MEM || type == IORESOURCE_IO) +> + if (type = IORESOURCE_MEM || type = IORESOURCE_IO) > + release_resource(r); > + } > + @@ -82,7 +82,7 @@ together? > - if (r->flags & (IORESOURCE_MEM|IORESOURCE_IO)) > + unsigned long type = resource_type(r); > + -> + if (type == IORESOURCE_MEM || type == IORESOURCE_IO) +> + if (type = IORESOURCE_MEM || type = IORESOURCE_IO) > release_resource(r); > } > } diff --git a/a/content_digest b/N1/content_digest index dff3117..5435792 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,8 @@ "ref\020080718074002.32713.73442.sendpatchset@rx1.opensource.se\0" "ref\020080718074018.32713.11976.sendpatchset@rx1.opensource.se\0" "From\0Ben Dooks <ben-linux@fluff.org>\0" - "Subject\0Re: [PATCH 02/05] resource: add resource_type() and IORESOURCE_TYPE_BITS\0" - "Date\0Fri, 18 Jul 2008 08:56:01 +0100\0" + "Subject\0Re: [PATCH 02/05] resource: add resource_type() and\0" + "Date\0Fri, 18 Jul 2008 07:56:01 +0000\0" "To\0Magnus Damm <magnus.damm@gmail.com>\0" "Cc\0linux-kernel@vger.kernel.org" linux-sh@vger.kernel.org @@ -34,10 +34,10 @@ "> \t\tstruct resource *r = &dev->resource[i];\n" "> \n" "> -\t\tif ((r->flags & (IORESOURCE_IO|IORESOURCE_MEM|\n" - "> -\t\t\t\t IORESOURCE_IRQ|IORESOURCE_DMA)) == type)\n" - "> -\t\t\tif (num-- == 0)\n" + "> -\t\t\t\t IORESOURCE_IRQ|IORESOURCE_DMA)) = type)\n" + "> -\t\t\tif (num-- = 0)\n" "> -\t\t\t\treturn r;\n" - "> +\t\tif (type == resource_type(r) && num-- == 0)\n" + "> +\t\tif (type = resource_type(r) && num-- = 0)\n" "> +\t\t\treturn r;\n" "> \t}\n" "> \treturn NULL;\n" @@ -47,10 +47,10 @@ "> \t\tstruct resource *r = &dev->resource[i];\n" "> \n" "> -\t\tif ((r->flags & (IORESOURCE_IO|IORESOURCE_MEM|\n" - "> -\t\t\t\t IORESOURCE_IRQ|IORESOURCE_DMA)) == type)\n" + "> -\t\t\t\t IORESOURCE_IRQ|IORESOURCE_DMA)) = type)\n" "> -\t\t\tif (!strcmp(r->name, name))\n" "> -\t\t\t\treturn r;\n" - "> +\t\tif (type == resource_type(r) && !strcmp(r->name, name))\n" + "> +\t\tif (type = resource_type(r) && !strcmp(r->name, name))\n" "> +\t\t\treturn r;\n" "> \t}\n" "> \treturn NULL;\n" @@ -60,10 +60,10 @@ "> \t\tp = r->parent;\n" "> \t\tif (!p) {\n" "> -\t\t\tif (r->flags & IORESOURCE_MEM)\n" - "> +\t\t\tif (resource_type(r) == IORESOURCE_MEM)\n" + "> +\t\t\tif (resource_type(r) = IORESOURCE_MEM)\n" "> \t\t\t\tp = &iomem_resource;\n" "> -\t\t\telse if (r->flags & IORESOURCE_IO)\n" - "> +\t\t\telse if (resource_type(r) == IORESOURCE_IO)\n" + "> +\t\t\telse if (resource_type(r) = IORESOURCE_IO)\n" "> \t\t\t\tp = &ioport_resource;\n" "> \t\t}\n" "\n" @@ -82,7 +82,7 @@ "> +\t\tstruct resource *r = &pdev->resource[i];\n" "> +\t\tunsigned long type = resource_type(r);\n" "> +\n" - "> +\t\tif (type == IORESOURCE_MEM || type == IORESOURCE_IO)\n" + "> +\t\tif (type = IORESOURCE_MEM || type = IORESOURCE_IO)\n" "> +\t\t\trelease_resource(r);\n" "> +\t}\n" "> +\n" @@ -96,7 +96,7 @@ "> -\t\t\tif (r->flags & (IORESOURCE_MEM|IORESOURCE_IO))\n" "> +\t\t\tunsigned long type = resource_type(r);\n" "> +\n" - "> +\t\t\tif (type == IORESOURCE_MEM || type == IORESOURCE_IO)\n" + "> +\t\t\tif (type = IORESOURCE_MEM || type = IORESOURCE_IO)\n" "> \t\t\t\trelease_resource(r);\n" "> \t\t}\n" "> \t}\n" @@ -134,4 +134,4 @@ "\n" 'a smiley only costs 4 bytes' -8bab04063871355b1cb889a2e1dfcd87e257b0a9bcd8fcb777ee6c2e8fbe843c +4bb214bdc005c634d6e7f40a2e60e571a0e6e26f92d1723aedf4e20cb03e50e5
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.