Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752755AbbGJBgl (ORCPT ); Thu, 9 Jul 2015 21:36:41 -0400 Received: from mail-pa0-f51.google.com ([209.85.220.51]:33006 "EHLO mail-pa0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752696AbbGJBgk (ORCPT ); Thu, 9 Jul 2015 21:36:40 -0400 From: "Luis R. Rodriguez" To: mingo@elte.hu Cc: vinod.koul@intel.com, dan.j.williams@intel.com, dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org, benh@kernel.crashing.org, "Luis R. Rodriguez" Subject: [PATCH v2 0/2] dma: rename write-combine APIs with short form Date: Thu, 9 Jul 2015 18:34:22 -0700 Message-Id: <1436492064-3400-1-git-send-email-mcgrof@do-not-panic.com> X-Mailer: git-send-email 2.1.4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 4049 Lines: 78 From: "Luis R. Rodriguez" Ingo, You had asked for this to be kept in my tree until the end of the merge window. I sent it a bit earlier than the end of the merge window, it failed to apply to Boris' tree as my series was based on linux-next and then I went on a small vacation. Boris is now on vacation as well. I've respinned this series today -- and fortunatley both of the patches in this series apply to both Linus' tree and linux-next, I am in hopes it applies to any other tree as well without conflicts. If not it should be easy to respin with the Coccinelle SmPL rule defined. I'll note that there are a few outstanding series related to MTRR, but those do not have conflicts with these patches at all so feel free to consider these before or after. Also I tried to get an ack for the first patch [1] but that has gone under the radar I believe so merging it now as part of this series and Cc'ing the maintainers. That change is needed in order to make the code match the grammar used by Coccinelle used in the expressed transformation. [0] http://lkml.kernel.org/r/20150601085332.GA14549@gmail.com [1] http://lkml.kernel.org/r/1434483609-25498-1-git-send-email-mcgrof@do-not-panic.com Luis R. Rodriguez (2): drivers/dma/iop-adma: Use dma_alloc_writecombine() kernel-style dma: rename dma_*_writecombine() to dma_*_wc() arch/arm/mach-lpc32xx/phy3250.c | 13 ++++++------- arch/arm/mach-netx/fb.c | 14 ++++++-------- arch/arm/mach-nspire/clcd.c | 13 ++++++------- arch/avr32/include/asm/dma-mapping.h | 20 ++++++++++---------- arch/avr32/mm/dma-coherent.c | 12 ++++++------ arch/metag/include/asm/dma-mapping.h | 4 ++-- arch/metag/kernel/dma.c | 6 +++--- drivers/dma/iop-adma.c | 9 +++++---- drivers/dma/mv_xor.c | 4 ++-- drivers/dma/qcom_bam_dma.c | 14 +++++++------- drivers/gpu/drm/drm_gem_cma_helper.c | 13 ++++++------- drivers/gpu/drm/omapdrm/omap_dmm_tiler.c | 13 ++++++------- drivers/gpu/drm/omapdrm/omap_gem.c | 8 ++++---- drivers/gpu/drm/sti/sti_cursor.c | 20 ++++++++------------ drivers/gpu/drm/sti/sti_gdp.c | 3 +-- drivers/gpu/drm/sti/sti_hqvdp.c | 6 +++--- drivers/gpu/drm/tegra/gem.c | 11 +++++------ drivers/gpu/host1x/cdma.c | 8 ++++---- drivers/gpu/host1x/job.c | 10 ++++------ drivers/media/platform/coda/coda-bit.c | 10 +++++----- drivers/video/fbdev/acornfb.c | 4 ++-- drivers/video/fbdev/amba-clcd-versatile.c | 14 ++++++-------- drivers/video/fbdev/amba-clcd.c | 4 ++-- drivers/video/fbdev/atmel_lcdfb.c | 9 +++++---- drivers/video/fbdev/ep93xx-fb.c | 8 +++----- drivers/video/fbdev/gbefb.c | 8 ++++---- drivers/video/fbdev/imxfb.c | 12 ++++++------ drivers/video/fbdev/mx3fb.c | 9 ++++----- drivers/video/fbdev/nuc900fb.c | 8 ++++---- drivers/video/fbdev/omap/lcdc.c | 16 ++++++++-------- drivers/video/fbdev/pxa168fb.c | 8 ++++---- drivers/video/fbdev/pxafb.c | 4 ++-- drivers/video/fbdev/s3c-fb.c | 7 +++---- drivers/video/fbdev/s3c2410fb.c | 8 ++++---- drivers/video/fbdev/sa1100fb.c | 8 ++++---- include/linux/dma-mapping.h | 16 ++++++++-------- sound/arm/pxa2xx-pcm-lib.c | 20 ++++++++------------ sound/soc/fsl/imx-pcm-fiq.c | 10 ++++------ sound/soc/nuc900/nuc900-pcm.c | 6 ++---- sound/soc/omap/omap-pcm.c | 12 ++++-------- 40 files changed, 186 insertions(+), 216 deletions(-) -- 2.3.2.209.gd67f9d5.dirty -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/