diff options
-rw-r--r-- | drivers/block/ps3vram.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/drivers/block/ps3vram.c b/drivers/block/ps3vram.c index 7d1c742d6d66..5f408c6e5b20 100644 --- a/drivers/block/ps3vram.c +++ b/drivers/block/ps3vram.c | |||
@@ -73,7 +73,6 @@ struct ps3vram_priv { | |||
73 | u64 context_handle; | 73 | u64 context_handle; |
74 | u32 *ctrl; | 74 | u32 *ctrl; |
75 | u32 *reports; | 75 | u32 *reports; |
76 | u8 __iomem *ddr_base; | ||
77 | u8 *xdr_buf; | 76 | u8 *xdr_buf; |
78 | 77 | ||
79 | u32 *fifo_base; | 78 | u32 *fifo_base; |
@@ -702,19 +701,11 @@ static int __devinit ps3vram_probe(struct ps3_system_bus_device *dev) | |||
702 | goto out_free_context; | 701 | goto out_free_context; |
703 | } | 702 | } |
704 | 703 | ||
705 | priv->ddr_base = ioremap_flags(ddr_lpar, ddr_size, _PAGE_NO_CACHE); | ||
706 | |||
707 | if (!priv->ddr_base) { | ||
708 | dev_err(&dev->core, "ioremap DDR failed\n"); | ||
709 | error = -ENOMEM; | ||
710 | goto out_unmap_context; | ||
711 | } | ||
712 | |||
713 | priv->ctrl = ioremap(ctrl_lpar, 64 * 1024); | 704 | priv->ctrl = ioremap(ctrl_lpar, 64 * 1024); |
714 | if (!priv->ctrl) { | 705 | if (!priv->ctrl) { |
715 | dev_err(&dev->core, "ioremap CTRL failed\n"); | 706 | dev_err(&dev->core, "ioremap CTRL failed\n"); |
716 | error = -ENOMEM; | 707 | error = -ENOMEM; |
717 | goto out_unmap_vram; | 708 | goto out_unmap_context; |
718 | } | 709 | } |
719 | 710 | ||
720 | priv->reports = ioremap(reports_lpar, reports_size); | 711 | priv->reports = ioremap(reports_lpar, reports_size); |
@@ -791,8 +782,6 @@ out_unmap_reports: | |||
791 | iounmap(priv->reports); | 782 | iounmap(priv->reports); |
792 | out_unmap_ctrl: | 783 | out_unmap_ctrl: |
793 | iounmap(priv->ctrl); | 784 | iounmap(priv->ctrl); |
794 | out_unmap_vram: | ||
795 | iounmap(priv->ddr_base); | ||
796 | out_unmap_context: | 785 | out_unmap_context: |
797 | lv1_gpu_context_iomap(priv->context_handle, XDR_IOIF, xdr_lpar, | 786 | lv1_gpu_context_iomap(priv->context_handle, XDR_IOIF, xdr_lpar, |
798 | XDR_BUF_SIZE, CBE_IOPTE_M); | 787 | XDR_BUF_SIZE, CBE_IOPTE_M); |
@@ -822,7 +811,6 @@ static int ps3vram_remove(struct ps3_system_bus_device *dev) | |||
822 | ps3vram_cache_cleanup(dev); | 811 | ps3vram_cache_cleanup(dev); |
823 | iounmap(priv->reports); | 812 | iounmap(priv->reports); |
824 | iounmap(priv->ctrl); | 813 | iounmap(priv->ctrl); |
825 | iounmap(priv->ddr_base); | ||
826 | lv1_gpu_context_iomap(priv->context_handle, XDR_IOIF, | 814 | lv1_gpu_context_iomap(priv->context_handle, XDR_IOIF, |
827 | ps3_mm_phys_to_lpar(__pa(priv->xdr_buf)), | 815 | ps3_mm_phys_to_lpar(__pa(priv->xdr_buf)), |
828 | XDR_BUF_SIZE, CBE_IOPTE_M); | 816 | XDR_BUF_SIZE, CBE_IOPTE_M); |