diff for duplicates of <20140620125259.GL30188@leverpostej> diff --git a/a/1.txt b/N1/1.txt index 7e5c3ec..9190d55 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -77,7 +77,7 @@ Mark. > - (void *)(unsigned long)id); > + chan = dma_request_slave_channel_compat(mask, shdma_chan_filter, > + (void *)(unsigned long)id, dev, -> + dir = DMA_MEM_TO_DEV ? "tx" : "rx"); +> + dir == DMA_MEM_TO_DEV ? "tx" : "rx"); > if (!chan) { > - dev_warn(dev, "dma_request_channel failed\n"); > + dev_warn(dev, "dma_request_slave_channel_compat failed\n"); diff --git a/a/content_digest b/N1/content_digest index 341a18c..c20efe2 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\01403259638-13774-2-git-send-email-geert+renesas@glider.be\0" "From\0Mark Rutland <mark.rutland@arm.com>\0" "Subject\0Re: [PATCH/RFC 1/2] spi: sh-msiof: Add DT support to DMA setup\0" - "Date\0Fri, 20 Jun 2014 12:52:59 +0000\0" + "Date\0Fri, 20 Jun 2014 13:52:59 +0100\0" "To\0Geert Uytterhoeven <geert+renesas@glider.be>\0" "Cc\0Simon Horman <horms@verge.net.au>" Magnus Damm <magnus.damm@gmail.com> @@ -92,7 +92,7 @@ "> -\t\t\t\t (void *)(unsigned long)id);\n" "> +\tchan = dma_request_slave_channel_compat(mask, shdma_chan_filter,\n" "> +\t\t\t\t(void *)(unsigned long)id, dev,\n" - "> +\t\t\t\tdir = DMA_MEM_TO_DEV ? \"tx\" : \"rx\");\n" + "> +\t\t\t\tdir == DMA_MEM_TO_DEV ? \"tx\" : \"rx\");\n" "> \tif (!chan) {\n" "> -\t\tdev_warn(dev, \"dma_request_channel failed\\n\");\n" "> +\t\tdev_warn(dev, \"dma_request_slave_channel_compat failed\\n\");\n" @@ -148,4 +148,4 @@ "> More majordomo info at http://vger.kernel.org/majordomo-info.html\n" > -1cb803c037f6c663553c698d5385e8d89bce528b0c9c87d114a6d92b2fa38ddd +a558111c6d215bccbae05ba3f1c1d759c7793e85c1509316a23e7610b03af370
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.