diff for duplicates of <20080320135618.1a283b3e.akpm@linux-foundation.org> diff --git a/a/1.txt b/N1/1.txt index dffe4f1..e5d9a7e 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -16,7 +16,7 @@ Adrian McMenamin <adrian@newgolddream.dyndns.info> wrote: > 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; > - } @@ -125,7 +125,8 @@ and what their ranking rules are. > 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 +448,15 @@ static void maple_map_subunits(struct maple_device *mdev, int submask) > mdev_add = maple_alloc_dev(mdev->port, k + 1); > if (!mdev_add) @@ -173,7 +174,7 @@ the driver has lost track of whether or not the semphore was taken. > INIT_LIST_HEAD(&maple_sentq); > + mutex_unlock(&maple_list_lock); > + /* if scanning is 1 then we have subdevices to check */ -> if (scanning = 1) { +> if (scanning == 1) { > maple_send(); > scanning = 2; > } else @@ -183,7 +184,7 @@ the driver has lost track of whether or not the semphore was taken. > if (!fullscan) { > fullscan = 1; > for (i = 0; i < MAPLE_PORTS; i++) { -> if (checked[i] = false) { +> if (checked[i] == false) { > fullscan = 0; > dev = baseunits[i]; > + locking = down_trylock(&dev->mq->sem); @@ -195,14 +196,15 @@ the driver has lost track of whether or not the semphore was taken. Ditto. -> dev->mq->command > MAPLE_COMMAND_DEVINFO; +> dev->mq->command = +> MAPLE_COMMAND_DEVINFO; > dev->mq->length = 0; > @@ -578,8 +605,11 @@ static void maple_dma_handler(struct work_struct *work) > } > } > } > + /* mark that we have been through the first scan */ -> if (started = 0) +> if (started == 0) > started = 1; > + } else { > + mutex_unlock(&maple_list_lock); @@ -210,7 +212,7 @@ Ditto. > maplebus_dma_reset(); > } > @@ -631,7 +661,7 @@ static int match_maple_bus_driver(struct device *devptr, -> 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 4ec8a87..3679682 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,8 @@ "ref\01205879413.6250.13.camel@localhost.localdomain\0" "ref\01205880554.6250.25.camel@localhost.localdomain\0" "From\0Andrew Morton <akpm@linux-foundation.org>\0" - "Subject\0Re: [PATCH] 1/2 Maple: Update bus driver to allow support of VMU\0" - "Date\0Thu, 20 Mar 2008 20:56:18 +0000\0" + "Subject\0Re: [PATCH] 1/2 Maple: Update bus driver to allow support of VMU device\0" + "Date\0Thu, 20 Mar 2008 13:56:18 -0700\0" "To\0Adrian McMenamin <adrian@newgolddream.dyndns.info>\0" "Cc\0dwmw2@infradead.org" greg@kroah.com @@ -30,7 +30,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" @@ -139,7 +139,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 +448,15 @@ static void maple_map_subunits(struct maple_device *mdev, int submask)\n" "> \t\t\tmdev_add = maple_alloc_dev(mdev->port, k + 1);\n" "> \t\t\tif (!mdev_add)\n" @@ -187,7 +188,7 @@ "> \t\tINIT_LIST_HEAD(&maple_sentq);\n" "> +\t\tmutex_unlock(&maple_list_lock);\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" @@ -197,7 +198,7 @@ "> \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\tlocking = down_trylock(&dev->mq->sem);\n" @@ -209,14 +210,15 @@ "\n" "Ditto.\n" "\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" "> @@ -578,8 +605,11 @@ static void maple_dma_handler(struct work_struct *work)\n" "> \t\t\t\t}\n" "> \t\t\t}\n" "> \t\t}\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} else {\n" "> +\t\tmutex_unlock(&maple_list_lock);\n" @@ -224,7 +226,7 @@ "> \tmaplebus_dma_reset();\n" "> }\n" "> @@ -631,7 +661,7 @@ static int match_maple_bus_driver(struct device *devptr,\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" @@ -271,4 +273,4 @@ "\n" Stray newline. -780b8b1cafc494e3656590121038abc770acbefd3b104b9d6bb34e504ee22643 +308bb82336752284e6191bb38431a80a442c34283b9ea40988fc140a97fa5ca8
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.