[media] ti-fpe: LLVMLinux: Remove nested function from ti-vpe

Replace the use of nested functions where a normal function will suffice.

Nested functions are not liked by upstream kernel developers in general. Their
use breaks the use of clang as a compiler, and doesn't make the code any
better.

This code now works for both gcc and clang.

Suggested-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Behan Webster <behanw@converseincode.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

diff --git a/drivers/media/platform/ti-vpe/csc.c b/drivers/media/platform/ti-vpe/csc.c
index 940df4000c4234b6bbd9cd765feb6871c99c564c..44fbf41fba7f7707f37c96a1c397faa3a198dac3 100644 (file)
--- 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);

diff --git a/drivers/media/platform/ti-vpe/sc.c b/drivers/media/platform/ti-vpe/sc.c
index 6314171ffe9b816ad758af828931f62ad39a2e41..1088381bd349d22af3a60ef038b319bacc09bf80 100644 (file)
--- a/drivers/media/platform/ti-vpe/sc.c
+++ b/drivers/media/platform/ti-vpe/sc.c
@@ -24,12 +24,8 @@ void sc_dump_regs(struct sc_data *sc)
 {
        struct device *dev = &sc->pdev->dev;
 
-       u32 read_reg(struct sc_data *sc, int offset)
-       {
-               return ioread32(sc->base + offset);
-       }
-
-#define DUMPREG(r) dev_dbg(dev, "%-35s %08x\n", #r, read_reg(sc, CFG_##r))
+#define DUMPREG(r) dev_dbg(dev, "%-35s %08x\n", #r, \
+       ioread32(sc->base + CFG_##r))
 
        DUMPREG(SC0);
        DUMPREG(SC1);