diff for duplicates of <538F4132.4030204@codethink.co.uk> diff --git a/a/1.txt b/N1/1.txt index b0bdb3b..81f1bf3 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -12,8 +12,9 @@ On 21/05/14 21:14, Geert Uytterhoeven wrote: >>>> struct dma_chan *chan; >>>> >>>> - if (dma_spec->args_count != 1) ->>>> + if (dma_spec->args_count = 2) { ->>>> + struct shdma_of_state *state >>>> platform_get_drvdata(pdev); +>>>> + if (dma_spec->args_count == 2) { +>>>> + struct shdma_of_state *state = +>>>> platform_get_drvdata(pdev); >>>> + struct shdma_of_client *client; >>>> + >>>> + client = shdma_of_find_client(state, id); @@ -24,7 +25,8 @@ On 21/05/14 21:14, Geert Uytterhoeven wrote: >>>> + if (!client) >>>> + return NULL; >>>> + ->>>> + client->index >>>> atomic_inc_return(&of_slave_index); +>>>> + client->index = +>>>> atomic_inc_return(&of_slave_index); >>>> + client->cfg.slave_id = id; >>>> + client->cfg.mid_rid = id; >>>> + client->cfg.chcr = dma_spec->args[1]; diff --git a/a/content_digest b/N1/content_digest index e04cb6f..a937920 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -5,7 +5,7 @@ "ref\0CAMuHMdU-FEnAjjcACaFt_-5i4EFDnj=uqrM_ew+nz7n9+ndbSQ@mail.gmail.com\0" "From\0Ben Dooks <ben.dooks@codethink.co.uk>\0" "Subject\0Re: [PATCH v2 8/9] DMA: shdma: initial of common code\0" - "Date\0Wed, 04 Jun 2014 15:54:26 +0000\0" + "Date\0Wed, 04 Jun 2014 16:54:26 +0100\0" "To\0Geert Uytterhoeven <geert@linux-m68k.org>\0" "Cc\0Arnd Bergmann <arnd@arndb.de>" linux-kernel@lists.codethink.co.uk @@ -34,8 +34,9 @@ ">>>> struct dma_chan *chan;\n" ">>>>\n" ">>>> - if (dma_spec->args_count != 1)\n" - ">>>> + if (dma_spec->args_count = 2) {\n" - ">>>> + struct shdma_of_state *state >>>> platform_get_drvdata(pdev);\n" + ">>>> + if (dma_spec->args_count == 2) {\n" + ">>>> + struct shdma_of_state *state =\n" + ">>>> platform_get_drvdata(pdev);\n" ">>>> + struct shdma_of_client *client;\n" ">>>> +\n" ">>>> + client = shdma_of_find_client(state, id);\n" @@ -46,7 +47,8 @@ ">>>> + if (!client)\n" ">>>> + return NULL;\n" ">>>> +\n" - ">>>> + client->index >>>> atomic_inc_return(&of_slave_index);\n" + ">>>> + client->index =\n" + ">>>> atomic_inc_return(&of_slave_index);\n" ">>>> + client->cfg.slave_id = id;\n" ">>>> + client->cfg.mid_rid = id;\n" ">>>> + client->cfg.chcr = dma_spec->args[1];\n" @@ -81,4 +83,4 @@ "Ben Dooks\t\t\t\thttp://www.codethink.co.uk/\n" "Senior Engineer\t\t\t\tCodethink - Providing Genius" -f8de35c090ff1802500c708155718e088172efcff3d103edb14cd3c18c596776 +63fa1eb0e6ddd4ff6ec0e6da89170d3c9fda0da75bde428086d0a9b8cd9f1207
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.