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

Commit c3b94fd8 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Benjamin Herrenschmidt
Browse files

ps3vram: Remove no longer used ps3vram_priv.ddr_base 



Signed-off-by: default avatarGeert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
Cc: Jim Paris <jim@jtan.com>
Cc: Jens Axboe <axboe@kernel.dk>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent fb89e89d

drivers/block/ps3vram.c

+1 −13
Original line number Original line Diff line number Diff line
@@ -73,7 +73,6 @@ struct ps3vram_priv { 
	u64 context_handle;

	u64 context_handle;

	u32 *ctrl;

	u32 *ctrl;

	u32 *reports;

	u32 *reports;

	u8 __iomem *ddr_base;

	u8 *xdr_buf;

	u8 *xdr_buf;





	u32 *fifo_base;

	u32 *fifo_base;
@@ -702,19 +701,11 @@ static int __devinit ps3vram_probe(struct ps3_system_bus_device *dev) 
		goto out_free_context;

		goto out_free_context;

	}

	}





	priv->ddr_base = ioremap_flags(ddr_lpar, ddr_size, _PAGE_NO_CACHE);



	if (!priv->ddr_base) {

		dev_err(&dev->core, "ioremap DDR failed\n");

		error = -ENOMEM;

		goto out_unmap_context;

	}



	priv->ctrl = ioremap(ctrl_lpar, 64 * 1024);

	priv->ctrl = ioremap(ctrl_lpar, 64 * 1024);

	if (!priv->ctrl) {

	if (!priv->ctrl) {

		dev_err(&dev->core, "ioremap CTRL failed\n");

		dev_err(&dev->core, "ioremap CTRL failed\n");

		error = -ENOMEM;

		error = -ENOMEM;

		goto out_unmap_vram;

		goto out_unmap_context;

	}

	}





	priv->reports = ioremap(reports_lpar, reports_size);

	priv->reports = ioremap(reports_lpar, reports_size);
@@ -791,8 +782,6 @@ static int __devinit ps3vram_probe(struct ps3_system_bus_device *dev) 
	iounmap(priv->reports);

	iounmap(priv->reports);

out_unmap_ctrl:

out_unmap_ctrl:

	iounmap(priv->ctrl);

	iounmap(priv->ctrl);

out_unmap_vram:

	iounmap(priv->ddr_base);

out_unmap_context:

out_unmap_context:

	lv1_gpu_context_iomap(priv->context_handle, XDR_IOIF, xdr_lpar,

	lv1_gpu_context_iomap(priv->context_handle, XDR_IOIF, xdr_lpar,

			      XDR_BUF_SIZE, CBE_IOPTE_M);

			      XDR_BUF_SIZE, CBE_IOPTE_M);
@@ -822,7 +811,6 @@ static int ps3vram_remove(struct ps3_system_bus_device *dev) 
	ps3vram_cache_cleanup(dev);

	ps3vram_cache_cleanup(dev);

	iounmap(priv->reports);

	iounmap(priv->reports);

	iounmap(priv->ctrl);

	iounmap(priv->ctrl);

	iounmap(priv->ddr_base);

	lv1_gpu_context_iomap(priv->context_handle, XDR_IOIF,

	lv1_gpu_context_iomap(priv->context_handle, XDR_IOIF,

			      ps3_mm_phys_to_lpar(__pa(priv->xdr_buf)),

			      ps3_mm_phys_to_lpar(__pa(priv->xdr_buf)),

			      XDR_BUF_SIZE, CBE_IOPTE_M);

			      XDR_BUF_SIZE, CBE_IOPTE_M);