| Message ID | 1411780305-5685-1-git-send-email-behanw@converseincode.com |
|---|---|
| State | Accepted |
| Commit | 61110fbab1f083249ac0ac7090526798d8815210 |
| Headers | show |
Em Fri, 26 Sep 2014 18:11:45 -0700 Behan Webster <behanw@converseincode.com> escreveu: > 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. I'm ok with this patch, as it makes the code cleaner, but in a few cases, such functions could be useful, for example for doing things like typecasting or when we need to use multiple versions of the same code, one to be used internally and another to be used externally with a different set of arguments inside the function call (none of this applies here, it seems). So, I think clang should be fixed anyway to support it. Anyway, I'll be applying this patch. Regards, Mauro > > Signed-off-by: Behan Webster <behanw@converseincode.com> > Suggested-by: Arnd Bergmann <arnd@arndb.de> > Cc: Arnd Bergmann <arnd@arndb.de> > --- > drivers/media/platform/ti-vpe/csc.c | 8 ++------ > drivers/media/platform/ti-vpe/sc.c | 8 ++------ > 2 files changed, 4 insertions(+), 12 deletions(-) > > diff --git a/drivers/media/platform/ti-vpe/csc.c b/drivers/media/platform/ti-vpe/csc.c > index 940df40..44fbf41 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); > diff --git a/drivers/media/platform/ti-vpe/sc.c b/drivers/media/platform/ti-vpe/sc.c > index 6314171..1088381 100644 > --- 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); -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
diff --git a/drivers/media/platform/ti-vpe/csc.c b/drivers/media/platform/ti-vpe/csc.c index 940df40..44fbf41 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); diff --git a/drivers/media/platform/ti-vpe/sc.c b/drivers/media/platform/ti-vpe/sc.c index 6314171..1088381 100644 --- 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);
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. Signed-off-by: Behan Webster <behanw@converseincode.com> Suggested-by: Arnd Bergmann <arnd@arndb.de> Cc: Arnd Bergmann <arnd@arndb.de> --- drivers/media/platform/ti-vpe/csc.c | 8 ++------ drivers/media/platform/ti-vpe/sc.c | 8 ++------ 2 files changed, 4 insertions(+), 12 deletions(-)