diff for duplicates of <1233671878.6512.14.camel@localhost.localdomain> diff --git a/a/content_digest b/N1/content_digest index 8580ea2..066b8b5 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,13 +3,13 @@ "Subject\0[PATCH] sh: maple: Add support for VMU devices (v3) [2/3]\0" "Date\0Tue, 03 Feb 2009 14:37:58 +0000\0" "To\0greg KH <greg@kroah.com>\0" - "Cc\0Paul Mundt <lethal@linux-sh.org>" + "Cc\0linux-sh <linux-sh@vger.kernel.org>" Dmitry Torokhov <dmitry.torokhov@gmail.com> - dwmw2 <dwmw2@infradead.org> LKML <linux-kernel@vger.kernel.org> + Paul Mundt <lethal@linux-sh.org> MTD <linux-mtd@lists.infradead.org> - linux-sh <linux-sh@vger.kernel.org> - " linux-input <linux-input@vger.kernel.org>\0" + linux-input <linux-input@vger.kernel.org> + " dwmw2 <dwmw2@infradead.org>\0" "\00:1\0" "b\0" "Changes to the Maple bus driver to support the VMU.\n" @@ -1025,4 +1025,4 @@ " \tu32 command, u32 length, void *data);\n" void maple_clear_dev(struct maple_device *mdev); -28c235f8908dc0edf81d065e8d3f38fed13f1e9df25d87bc6c195ff1e5c0c74e +6e7d20c1795a1c52df53149e4bba55f48c895ccbd45403cbf0316c06ff382f0a
diff --git a/a/1.txt b/N2/1.txt index 9846215..adafa3a 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -278,8 +278,7 @@ index 63f0de2..b68a06b 100644 *maple_sendptr++ = (port << 16) | len | 0x80000000; - *maple_sendptr++ = PHYSADDR(mq->recvbuf); + *maple_sendptr++ = PHYSADDR(mq->recvbuf->buf); - *maple_sendptr++ = - mq->command | (to << 8) | (from << 16) | (len << 24); + *maple_sendptr++ mq->command | (to << 8) | (from << 16) | (len << 24); while (len-- > 0) @@ -333,20 +271,28 @@ static void maple_send(void) int i, maple_packets = 0; @@ -387,12 +386,11 @@ index 63f0de2..b68a06b 100644 - "Maple bus at (%d, %d): Function 0x%lX\n", - 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, - check_matching_maple_driver); + maple_check_matching_driver); - if (matched == 0) { + if (matched = 0) { /* Driver does not exist yet */ - printk(KERN_INFO - "No maple driver found.\n"); @@ -443,7 +441,7 @@ index 63f0de2..b68a06b 100644 - add = maple_add_packet(maple_dev, - be32_to_cpu(maple_dev->devinfo.function), + struct maple_device *mdev = to_maple_dev(device); -+ if ((mdev->interval > 0) && (mdev->busy == 0) && ++ if ((mdev->interval > 0) && (mdev->busy = 0) && + time_after(jiffies, mdev->when)) { + /* bounce if we cannot add */ + add = maple_add_packet(mdev, @@ -460,7 +458,7 @@ index 63f0de2..b68a06b 100644 + /* Ensure we don't have block reads and devinfo + * calls interfering with one another - so flag the + * device as busy */ -+ if (mdev->busy == 0) { ++ if (mdev->busy = 0) { + mdev->busy = 1; + maple_add_packet(mdev, 0, + MAPLE_COMMAND_DEVINFO, 0, NULL); @@ -533,8 +531,7 @@ index 63f0de2..b68a06b 100644 int retval, k, devcheck; @@ -533,7 +501,7 @@ static void maple_map_subunits(struct maple_device *mdev, int submask) ds.unit = k + 1; - retval = - bus_for_each_dev(&maple_bus_type, NULL, &ds, + retval bus_for_each_dev(&maple_bus_type, NULL, &ds, - detach_maple_device); + check_maple_device); if (retval) { @@ -589,13 +586,13 @@ index 63f0de2..b68a06b 100644 return; - } - if (!started || !fullscan) { -- if (checked[mdev->port] == false) { +- if (checked[mdev->port] = false) { - checked[mdev->port] = true; - printk(KERN_INFO "No maple devices attached" - " to port %d\n", mdev->port); + } else { + if (!started || !fullscan) { -+ if (checked[mdev->port] == false) { ++ if (checked[mdev->port] = false) { + checked[mdev->port] = true; + empty[mdev->port] = true; + dev_info(&mdev->dev, "no devices" @@ -615,14 +612,14 @@ index 63f0de2..b68a06b 100644 } else { if (mdev->unit != 0) maple_attach_driver(mdev); -+ if (mdev->unit == 0) { ++ if (mdev->unit = 0) { + empty[mdev->port] = false; + maple_attach_driver(mdev); + } } - return; } - if (mdev->unit == 0) { + if (mdev->unit = 0) { submask = recvbuf[2] & 0x1F; @@ -611,6 +601,17 @@ static void maple_response_devinfo(struct maple_device *mdev, } @@ -643,7 +640,7 @@ index 63f0de2..b68a06b 100644 { int i; @@ -621,12 +622,6 @@ static void maple_port_rescan(void) - if (checked[i] == false) { + if (checked[i] = false) { fullscan = 0; mdev = baseunits[i]; - /* @@ -739,7 +736,7 @@ index 63f0de2..b68a06b 100644 if (!fullscan) maple_port_rescan(); /* mark that we have been through the first scan */ -- if (started == 0) +- if (started = 0) - started = 1; + started = 1; } @@ -857,8 +854,7 @@ index 63f0de2..b68a06b 100644 goto cleanup_irq; } -- maple_queue_cache = -- kmem_cache_create("maple_queue_cache", 0x400, 0, +- maple_queue_cache - kmem_cache_create("maple_queue_cache", 0x400, 0, - SLAB_HWCACHE_ALIGN, NULL); + maple_queue_cache = KMEM_CACHE(maple_buffer, SLAB_HWCACHE_ALIGN); diff --git a/a/content_digest b/N2/content_digest index 8580ea2..589a537 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -292,8 +292,7 @@ " \t*maple_sendptr++ = (port << 16) | len | 0x80000000;\n" "-\t*maple_sendptr++ = PHYSADDR(mq->recvbuf);\n" "+\t*maple_sendptr++ = PHYSADDR(mq->recvbuf->buf);\n" - " \t*maple_sendptr++ =\n" - " \t mq->command | (to << 8) | (from << 16) | (len << 24);\n" + " \t*maple_sendptr++ \t mq->command | (to << 8) | (from << 16) | (len << 24);\n" " \twhile (len-- > 0)\n" "@@ -333,20 +271,28 @@ static void maple_send(void)\n" " \tint i, maple_packets = 0;\n" @@ -401,12 +400,11 @@ "-\t\t\t\"Maple bus at (%d, %d): Function 0x%lX\\n\",\n" "-\t\t\tmdev->port, mdev->unit, function);\n" " \n" - " \t\tmatched =\n" - " \t\t\tbus_for_each_drv(&maple_bus_type, NULL, mdev,\n" + " \t\tmatched \t\t\tbus_for_each_drv(&maple_bus_type, NULL, mdev,\n" "-\t\t\t\tcheck_matching_maple_driver);\n" "+\t\t\t\tmaple_check_matching_driver);\n" " \n" - " \t\tif (matched == 0) {\n" + " \t\tif (matched = 0) {\n" " \t\t\t/* Driver does not exist yet */\n" "-\t\t\tprintk(KERN_INFO\n" "-\t\t\t\t\"No maple driver found.\\n\");\n" @@ -457,7 +455,7 @@ "-\t\tadd = maple_add_packet(maple_dev,\n" "-\t\t\tbe32_to_cpu(maple_dev->devinfo.function),\n" "+\tstruct maple_device *mdev = to_maple_dev(device);\n" - "+\tif ((mdev->interval > 0) && (mdev->busy == 0) &&\n" + "+\tif ((mdev->interval > 0) && (mdev->busy = 0) &&\n" "+\t\ttime_after(jiffies, mdev->when)) {\n" "+\t\t/* bounce if we cannot add */\n" "+\t\tadd = maple_add_packet(mdev,\n" @@ -474,7 +472,7 @@ "+\t\t\t/* Ensure we don't have block reads and devinfo\n" "+\t\t\t* calls interfering with one another - so flag the\n" "+\t\t\t* device as busy */\n" - "+\t\t\tif (mdev->busy == 0) {\n" + "+\t\t\tif (mdev->busy = 0) {\n" "+\t\t\t\tmdev->busy = 1;\n" "+\t\t\t\tmaple_add_packet(mdev, 0,\n" "+\t\t\t\t\tMAPLE_COMMAND_DEVINFO, 0, NULL);\n" @@ -547,8 +545,7 @@ " \tint retval, k, devcheck;\n" "@@ -533,7 +501,7 @@ static void maple_map_subunits(struct maple_device *mdev, int submask)\n" " \t\tds.unit = k + 1;\n" - " \t\tretval =\n" - " \t\t bus_for_each_dev(&maple_bus_type, NULL, &ds,\n" + " \t\tretval \t\t bus_for_each_dev(&maple_bus_type, NULL, &ds,\n" "-\t\t\t\t detach_maple_device);\n" "+\t\t\t\t check_maple_device);\n" " \t\tif (retval) {\n" @@ -603,13 +600,13 @@ " \t\treturn;\n" "-\t}\n" "-\tif (!started || !fullscan) {\n" - "-\t\tif (checked[mdev->port] == false) {\n" + "-\t\tif (checked[mdev->port] = false) {\n" "-\t\t\tchecked[mdev->port] = true;\n" "-\t\t\tprintk(KERN_INFO \"No maple devices attached\"\n" "-\t\t\t\t\" to port %d\\n\", mdev->port);\n" "+\t} else {\n" "+\t\tif (!started || !fullscan) {\n" - "+\t\t\tif (checked[mdev->port] == false) {\n" + "+\t\t\tif (checked[mdev->port] = false) {\n" "+\t\t\t\tchecked[mdev->port] = true;\n" "+\t\t\t\tempty[mdev->port] = true;\n" "+\t\t\t\tdev_info(&mdev->dev, \"no devices\"\n" @@ -629,14 +626,14 @@ " \t\t} else {\n" " \t\t\tif (mdev->unit != 0)\n" " \t\t\t\tmaple_attach_driver(mdev);\n" - "+\t\t\tif (mdev->unit == 0) {\n" + "+\t\t\tif (mdev->unit = 0) {\n" "+\t\t\t\tempty[mdev->port] = false;\n" "+\t\t\t\tmaple_attach_driver(mdev);\n" "+\t\t\t}\n" " \t\t}\n" "-\t\treturn;\n" " \t}\n" - " \tif (mdev->unit == 0) {\n" + " \tif (mdev->unit = 0) {\n" " \t\tsubmask = recvbuf[2] & 0x1F;\n" "@@ -611,6 +601,17 @@ static void maple_response_devinfo(struct maple_device *mdev,\n" " \t}\n" @@ -657,7 +654,7 @@ " {\n" " \tint i;\n" "@@ -621,12 +622,6 @@ static void maple_port_rescan(void)\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" @@ -753,7 +750,7 @@ " \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\tstarted = 1;\n" " \t}\n" @@ -871,8 +868,7 @@ " \t\tgoto cleanup_irq;\n" " \t}\n" " \n" - "-\tmaple_queue_cache =\n" - "-\t kmem_cache_create(\"maple_queue_cache\", 0x400, 0,\n" + "-\tmaple_queue_cache -\t kmem_cache_create(\"maple_queue_cache\", 0x400, 0,\n" "-\t\t\t SLAB_HWCACHE_ALIGN, NULL);\n" "+\tmaple_queue_cache = KMEM_CACHE(maple_buffer, SLAB_HWCACHE_ALIGN);\n" " \n" @@ -1025,4 +1021,4 @@ " \tu32 command, u32 length, void *data);\n" void maple_clear_dev(struct maple_device *mdev); -28c235f8908dc0edf81d065e8d3f38fed13f1e9df25d87bc6c195ff1e5c0c74e +5f7b6cb9cbc314e600abd802dacb960a3aa780681494e4511c15942529250725
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.