Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5ec94246 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'mm-pat-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull dma_*_writecombine rename from Ingo Molnar:
 "Rename dma_*_writecombine() to dma_*_wc()

  This is a tree-wide API rename, to move the dma_*() write-combining
  APIs closer in name to their usual API families.  (The old API names
  are kept as compatibility wrappers to not introduce extra breakage.)

  The patch was Coccinelle generated"

* 'mm-pat-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  dma, mm/pat: Rename dma_*_writecombine() to dma_*_wc()
parents fbed0bc0 f6e45661

arch/arm/mach-lpc32xx/phy3250.c

+6 −7
Original line number Diff line number Diff line
@@ -86,8 +86,8 @@ static int lpc32xx_clcd_setup(struct clcd_fb *fb) 
{

	dma_addr_t dma;



	fb->fb.screen_base = dma_alloc_writecombine(&fb->dev->dev,

		PANEL_SIZE, &dma, GFP_KERNEL);

	fb->fb.screen_base = dma_alloc_wc(&fb->dev->dev, PANEL_SIZE, &dma,

					  GFP_KERNEL);

	if (!fb->fb.screen_base) {

		printk(KERN_ERR "CLCD: unable to map framebuffer\n");

		return -ENOMEM;
@@ -116,15 +116,14 @@ static int lpc32xx_clcd_setup(struct clcd_fb *fb) 


static int lpc32xx_clcd_mmap(struct clcd_fb *fb, struct vm_area_struct *vma)

{

	return dma_mmap_writecombine(&fb->dev->dev, vma,

		fb->fb.screen_base, fb->fb.fix.smem_start,

		fb->fb.fix.smem_len);

	return dma_mmap_wc(&fb->dev->dev, vma, fb->fb.screen_base,

			   fb->fb.fix.smem_start, fb->fb.fix.smem_len);

}



static void lpc32xx_clcd_remove(struct clcd_fb *fb)

{

	dma_free_writecombine(&fb->dev->dev, fb->fb.fix.smem_len,

		fb->fb.screen_base, fb->fb.fix.smem_start);

	dma_free_wc(&fb->dev->dev, fb->fb.fix.smem_len, fb->fb.screen_base,

		    fb->fb.fix.smem_start);

}



/*

arch/arm/mach-netx/fb.c

+6 −8
Original line number Diff line number Diff line
@@ -42,8 +42,8 @@ int netx_clcd_setup(struct clcd_fb *fb) 


	fb->panel = netx_panel;



	fb->fb.screen_base = dma_alloc_writecombine(&fb->dev->dev, 1024*1024,

						    &dma, GFP_KERNEL);

	fb->fb.screen_base = dma_alloc_wc(&fb->dev->dev, 1024 * 1024, &dma,

					  GFP_KERNEL);

	if (!fb->fb.screen_base) {

		printk(KERN_ERR "CLCD: unable to map framebuffer\n");

		return -ENOMEM;
@@ -57,16 +57,14 @@ int netx_clcd_setup(struct clcd_fb *fb) 


int netx_clcd_mmap(struct clcd_fb *fb, struct vm_area_struct *vma)

{

	return dma_mmap_writecombine(&fb->dev->dev, vma,

				     fb->fb.screen_base,

				     fb->fb.fix.smem_start,

				     fb->fb.fix.smem_len);

	return dma_mmap_wc(&fb->dev->dev, vma, fb->fb.screen_base,

			   fb->fb.fix.smem_start, fb->fb.fix.smem_len);

}



void netx_clcd_remove(struct clcd_fb *fb)

{

	dma_free_writecombine(&fb->dev->dev, fb->fb.fix.smem_len,

			      fb->fb.screen_base, fb->fb.fix.smem_start);

	dma_free_wc(&fb->dev->dev, fb->fb.fix.smem_len, fb->fb.screen_base,

		    fb->fb.fix.smem_start);

}



static AMBA_AHB_DEVICE(fb, "fb", 0, 0x00104000, { NETX_IRQ_LCD }, NULL);

arch/arm/mach-nspire/clcd.c

+6 −7
Original line number Diff line number Diff line
@@ -90,8 +90,8 @@ int nspire_clcd_setup(struct clcd_fb *fb) 
	panel_size = ((panel->mode.xres * panel->mode.yres) * panel->bpp) / 8;

	panel_size = ALIGN(panel_size, PAGE_SIZE);



	fb->fb.screen_base = dma_alloc_writecombine(&fb->dev->dev,

		panel_size, &dma, GFP_KERNEL);

	fb->fb.screen_base = dma_alloc_wc(&fb->dev->dev, panel_size, &dma,

					  GFP_KERNEL);



	if (!fb->fb.screen_base) {

		pr_err("CLCD: unable to map framebuffer\n");
@@ -107,13 +107,12 @@ int nspire_clcd_setup(struct clcd_fb *fb) 


int nspire_clcd_mmap(struct clcd_fb *fb, struct vm_area_struct *vma)

{

	return dma_mmap_writecombine(&fb->dev->dev, vma,

		fb->fb.screen_base, fb->fb.fix.smem_start,

		fb->fb.fix.smem_len);

	return dma_mmap_wc(&fb->dev->dev, vma, fb->fb.screen_base,

			   fb->fb.fix.smem_start, fb->fb.fix.smem_len);

}



void nspire_clcd_remove(struct clcd_fb *fb)

{

	dma_free_writecombine(&fb->dev->dev, fb->fb.fix.smem_len,

		fb->fb.screen_base, fb->fb.fix.smem_start);

	dma_free_wc(&fb->dev->dev, fb->fb.fix.smem_len, fb->fb.screen_base,

		    fb->fb.fix.smem_start);

}

drivers/dma/iop-adma.c

+4 −4
Original line number Diff line number Diff line
@@ -1300,7 +1300,7 @@ static int iop_adma_probe(struct platform_device *pdev) 
	 * note: writecombine gives slightly better performance, but

	 * requires that we explicitly flush the writes

	 */

	adev->dma_desc_pool_virt = dma_alloc_writecombine(&pdev->dev,

	adev->dma_desc_pool_virt = dma_alloc_wc(&pdev->dev,

						plat_data->pool_size,

						&adev->dma_desc_pool,

						GFP_KERNEL);

drivers/dma/mv_xor.c

+2 −2
Original line number Diff line number Diff line
@@ -964,8 +964,8 @@ mv_xor_channel_add(struct mv_xor_device *xordev, 
	 * requires that we explicitly flush the writes

	 */

	mv_chan->dma_desc_pool_virt =

	  dma_alloc_writecombine(&pdev->dev, MV_XOR_POOL_SIZE,

				 &mv_chan->dma_desc_pool, GFP_KERNEL);

	  dma_alloc_wc(&pdev->dev, MV_XOR_POOL_SIZE, &mv_chan->dma_desc_pool,

		       GFP_KERNEL);

	if (!mv_chan->dma_desc_pool_virt)

		return ERR_PTR(-ENOMEM);