diff for duplicates of <1217288656.6875.26.camel@localhost.localdomain> diff --git a/a/1.txt b/N1/1.txt index 2d303ae..4bdd82b 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -172,7 +172,8 @@ diff -ruNp a/drivers/sh/maple/maple.c b/drivers/sh/maple/maple.c @@ -216,7 +305,6 @@ static void maple_build_block(struct map *maple_sendptr++ = PHYSADDR(mq->recvbuf); - *maple_sendptr++ mq->command | (to << 8) | (from << 16) | (len << 24); + *maple_sendptr++ = + mq->command | (to << 8) | (from << 16) | (len << 24); - while (len-- > 0) *maple_sendptr++ = *lsendbuf++; @@ -225,7 +226,7 @@ diff -ruNp a/drivers/sh/maple/maple.c b/drivers/sh/maple/maple.c mdev = devptr; maple_drv = to_maple_driver(driver); - if (mdev->devinfo.function & be32_to_cpu(maple_drv->function)) { -- if (maple_drv->connect(mdev) = 0) { +- if (maple_drv->connect(mdev) == 0) { - mdev->driver = maple_drv; - return 1; - } @@ -250,12 +251,13 @@ diff -ruNp a/drivers/sh/maple/maple.c b/drivers/sh/maple/maple.c @@ -328,8 +413,8 @@ static void maple_attach_driver(struct m mdev->port, mdev->unit, function); - matched - bus_for_each_drv(&maple_bus_type, NULL, mdev, + matched = +- bus_for_each_drv(&maple_bus_type, NULL, mdev, - attach_matching_maple_driver); + bus_for_each_drv(&maple_bus_type, NULL, mdev, + check_matching_maple_driver); - if (matched = 0) { + if (matched == 0) { /* Driver does not exist yet */ @@ -373,45 +458,48 @@ static int detach_maple_device(struct de @@ -333,7 +335,8 @@ diff -ruNp a/drivers/sh/maple/maple.c b/drivers/sh/maple/maple.c for (k = 0; k < 5; k++) { - ds.port = mdev->port; ds.unit = k + 1; - retval bus_for_each_dev(&maple_bus_type, NULL, &ds, + retval = + bus_for_each_dev(&maple_bus_type, NULL, &ds, @@ -437,9 +525,9 @@ static void maple_map_subunits(struct ma mdev_add = maple_alloc_dev(mdev->port, k + 1); if (!mdev_add) @@ -358,7 +361,7 @@ diff -ruNp a/drivers/sh/maple/maple.c b/drivers/sh/maple/maple.c + + fullscan = 1; + for (i = 0; i < MAPLE_PORTS; i++) { -+ if (checked[i] = false) { ++ if (checked[i] == false) { + fullscan = 0; + mdev = baseunits[i]; + /* @@ -401,7 +404,7 @@ diff -ruNp a/drivers/sh/maple/maple.c b/drivers/sh/maple/maple.c } - INIT_LIST_HEAD(&maple_sentq); + /* if scanning is 1 then we have subdevices to check */ - if (scanning = 1) { + if (scanning == 1) { maple_send(); scanning = 2; } else @@ -410,10 +413,11 @@ diff -ruNp a/drivers/sh/maple/maple.c b/drivers/sh/maple/maple.c - if (!fullscan) { - fullscan = 1; - for (i = 0; i < MAPLE_PORTS; i++) { -- if (checked[i] = false) { +- if (checked[i] == false) { - fullscan = 0; - dev = baseunits[i]; -- dev->mq->command - MAPLE_COMMAND_DEVINFO; +- dev->mq->command = +- MAPLE_COMMAND_DEVINFO; - dev->mq->length = 0; - maple_add_packet(dev->mq); - } @@ -423,11 +427,11 @@ diff -ruNp a/drivers/sh/maple/maple.c b/drivers/sh/maple/maple.c + if (!fullscan) + maple_port_rescan(); + /* mark that we have been through the first scan */ - if (started = 0) + if (started == 0) started = 1; } @@ -631,7 +734,7 @@ static int match_maple_bus_driver(struct - if (maple_dev->devinfo.function = 0xFFFFFFFF) + if (maple_dev->devinfo.function == 0xFFFFFFFF) return 0; else if (maple_dev->devinfo.function & - be32_to_cpu(maple_drv->function)) diff --git a/a/content_digest b/N1/content_digest index 0f20490..52e1590 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Adrian McMenamin <adrian@newgolddream.dyndns.info>\0" "Subject\0[PATCH] sh/maple: clean maple bus code\0" - "Date\0Mon, 28 Jul 2008 23:44:16 +0000\0" + "Date\0Tue, 29 Jul 2008 00:44:16 +0100\0" "To\0Paul Mundt <lethal@linux-sh.org>" " linux-sh <linux-sh@vger.kernel.org>\0" "Cc\0LKML <linux-kernel@vger.kernel.org>\0" @@ -180,7 +180,8 @@ " \n" "@@ -216,7 +305,6 @@ static void maple_build_block(struct map\n" " \t*maple_sendptr++ = PHYSADDR(mq->recvbuf);\n" - " \t*maple_sendptr++ \t mq->command | (to << 8) | (from << 16) | (len << 24);\n" + " \t*maple_sendptr++ =\n" + " \t mq->command | (to << 8) | (from << 16) | (len << 24);\n" "-\n" " \twhile (len-- > 0)\n" " \t\t*maple_sendptr++ = *lsendbuf++;\n" @@ -233,7 +234,7 @@ " \tmdev = devptr;\n" " \tmaple_drv = to_maple_driver(driver);\n" "-\tif (mdev->devinfo.function & be32_to_cpu(maple_drv->function)) {\n" - "-\t\tif (maple_drv->connect(mdev) = 0) {\n" + "-\t\tif (maple_drv->connect(mdev) == 0) {\n" "-\t\t\tmdev->driver = maple_drv;\n" "-\t\t\treturn 1;\n" "-\t\t}\n" @@ -258,12 +259,13 @@ "@@ -328,8 +413,8 @@ static void maple_attach_driver(struct m\n" " \t\t\tmdev->port, mdev->unit, function);\n" " \n" - " \t\tmatched -\t\t bus_for_each_drv(&maple_bus_type, NULL, mdev,\n" + " \t\tmatched =\n" + "-\t\t bus_for_each_drv(&maple_bus_type, NULL, mdev,\n" "-\t\t\t\t attach_matching_maple_driver);\n" "+\t\t\tbus_for_each_drv(&maple_bus_type, NULL, mdev,\n" "+\t\t\t\tcheck_matching_maple_driver);\n" " \n" - " \t\tif (matched = 0) {\n" + " \t\tif (matched == 0) {\n" " \t\t\t/* Driver does not exist yet */\n" "@@ -373,45 +458,48 @@ static int detach_maple_device(struct de\n" " \n" @@ -341,7 +343,8 @@ " \tfor (k = 0; k < 5; k++) {\n" "-\t\tds.port = mdev->port;\n" " \t\tds.unit = k + 1;\n" - " \t\tretval \t\t bus_for_each_dev(&maple_bus_type, NULL, &ds,\n" + " \t\tretval =\n" + " \t\t bus_for_each_dev(&maple_bus_type, NULL, &ds,\n" "@@ -437,9 +525,9 @@ static void maple_map_subunits(struct ma\n" " \t\t\tmdev_add = maple_alloc_dev(mdev->port, k + 1);\n" " \t\t\tif (!mdev_add)\n" @@ -366,7 +369,7 @@ "+\n" "+\tfullscan = 1;\n" "+\tfor (i = 0; i < MAPLE_PORTS; i++) {\n" - "+\t\tif (checked[i] = false) {\n" + "+\t\tif (checked[i] == false) {\n" "+\t\t\tfullscan = 0;\n" "+\t\t\tmdev = baseunits[i];\n" "+\t\t\t/*\n" @@ -409,7 +412,7 @@ " \t\t}\n" "-\t\tINIT_LIST_HEAD(&maple_sentq);\n" "+\t\t/* if scanning is 1 then we have subdevices to check */\n" - " \t\tif (scanning = 1) {\n" + " \t\tif (scanning == 1) {\n" " \t\t\tmaple_send();\n" " \t\t\tscanning = 2;\n" " \t\t} else\n" @@ -418,10 +421,11 @@ "-\t\tif (!fullscan) {\n" "-\t\t\tfullscan = 1;\n" "-\t\t\tfor (i = 0; i < MAPLE_PORTS; i++) {\n" - "-\t\t\t\tif (checked[i] = false) {\n" + "-\t\t\t\tif (checked[i] == false) {\n" "-\t\t\t\t\tfullscan = 0;\n" "-\t\t\t\t\tdev = baseunits[i];\n" - "-\t\t\t\t\tdev->mq->command -\t\t\t\t\t\tMAPLE_COMMAND_DEVINFO;\n" + "-\t\t\t\t\tdev->mq->command =\n" + "-\t\t\t\t\t\tMAPLE_COMMAND_DEVINFO;\n" "-\t\t\t\t\tdev->mq->length = 0;\n" "-\t\t\t\t\tmaple_add_packet(dev->mq);\n" "-\t\t\t\t}\n" @@ -431,11 +435,11 @@ "+\t\tif (!fullscan)\n" "+\t\t\tmaple_port_rescan();\n" "+\t\t/* mark that we have been through the first scan */\n" - " \t\tif (started = 0)\n" + " \t\tif (started == 0)\n" " \t\t\tstarted = 1;\n" " \t}\n" "@@ -631,7 +734,7 @@ static int match_maple_bus_driver(struct\n" - " \tif (maple_dev->devinfo.function = 0xFFFFFFFF)\n" + " \tif (maple_dev->devinfo.function == 0xFFFFFFFF)\n" " \t\treturn 0;\n" " \telse if (maple_dev->devinfo.function &\n" "-\t\t be32_to_cpu(maple_drv->function))\n" @@ -491,4 +495,4 @@ " #define to_maple_dev(n) container_of(n, struct maple_device, dev)\n" #define to_maple_driver(n) container_of(n, struct maple_driver, drv) -53cc44756bbe57012f5f824d8605622fbcc99a5406287a8ff72b139bc0784a1a +032f6f20b910b1accf8b8f4bdeebd54d64a8c8694f109e6e03f7b67a84362115
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.