1 files changed, 3 insertions, 7 deletions

diff --git a/drivers/media/platform/ti-vpe/csc.c b/drivers/media/platform/ti-vpe/csc.c
index 940df4000c42..bec674994752 100644
--- a/drivers/media/platform/ti-vpe/csc.c
+++ b/drivers/media/platform/ti-vpe/csc.c
@@ -93,12 +93,8 @@ void csc_dump_regs(struct csc_data *csc)
 {
         struct device *dev = &csc->pdev->dev;
 
-        u32 read_reg(struct csc_data *csc, int offset)
-        {
-                return ioread32(csc->base + offset);
-        }
-
-#define DUMPREG(r) dev_dbg(dev, "%-35s %08x\n", #r, read_reg(csc, CSC_##r))
+#define DUMPREG(r) dev_dbg(dev, "%-35s %08x\n", #r, \
+        ioread32(csc->base + CSC_##r))
 
         DUMPREG(CSC00);
         DUMPREG(CSC01);
@@ -189,7 +185,7 @@ struct csc_data *csc_create(struct platform_device *pdev)
         csc->base = devm_ioremap_resource(&pdev->dev, csc->res);
         if (IS_ERR(csc->base)) {
                 dev_err(&pdev->dev, "failed to ioremap\n");
-                return csc->base;
+                return ERR_CAST(csc->base);
         }
 
         return csc;