| Message ID | 1352830403-1706-8-git-send-email-jon-hunter@ti.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 11/13/2012 12:13 PM, Jon Hunter wrote: > Some source files are including dmtimer.h but not actually using any dmtimer > definitions or functions. Therefore, remove the inclusion dmtimer.h from these > source files. > > Signed-off-by: Jon Hunter <jon-hunter@ti.com> > --- > arch/arm/mach-omap1/timer32k.c | 1 - > arch/arm/mach-omap2/omap_hwmod_2420_data.c | 1 - > arch/arm/mach-omap2/omap_hwmod_2430_data.c | 1 - > arch/arm/mach-omap2/pm-debug.c | 1 - > drivers/staging/tidspbridge/core/ue_deh.c | 1 - > 5 files changed, 5 deletions(-) > > diff --git a/arch/arm/mach-omap1/timer32k.c b/arch/arm/mach-omap1/timer32k.c > index 8936819..41152fa 100644 > --- a/arch/arm/mach-omap1/timer32k.c > +++ b/arch/arm/mach-omap1/timer32k.c > @@ -51,7 +51,6 @@ > #include <asm/mach/time.h> > > #include <plat/counter-32k.h> > -#include <plat/dmtimer.h> > > #include <mach/hardware.h> > > diff --git a/arch/arm/mach-omap2/omap_hwmod_2420_data.c b/arch/arm/mach-omap2/omap_hwmod_2420_data.c > index a8b3368..e8efe3d 100644 > --- a/arch/arm/mach-omap2/omap_hwmod_2420_data.c > +++ b/arch/arm/mach-omap2/omap_hwmod_2420_data.c > @@ -17,7 +17,6 @@ > #include <linux/platform_data/spi-omap2-mcspi.h> > > #include <plat-omap/dma-omap.h> > -#include <plat/dmtimer.h> > > #include "omap_hwmod.h" > #include "l3_2xxx.h" > diff --git a/arch/arm/mach-omap2/omap_hwmod_2430_data.c b/arch/arm/mach-omap2/omap_hwmod_2430_data.c > index dc768c5..32d17e3 100644 > --- a/arch/arm/mach-omap2/omap_hwmod_2430_data.c > +++ b/arch/arm/mach-omap2/omap_hwmod_2430_data.c > @@ -18,7 +18,6 @@ > #include <linux/platform_data/spi-omap2-mcspi.h> > > #include <plat-omap/dma-omap.h> > -#include <plat/dmtimer.h> > > #include "omap_hwmod.h" > #include "mmc.h" > diff --git a/arch/arm/mach-omap2/pm-debug.c b/arch/arm/mach-omap2/pm-debug.c > index 3cf4fdf..e2c291f 100644 > --- a/arch/arm/mach-omap2/pm-debug.c > +++ b/arch/arm/mach-omap2/pm-debug.c > @@ -30,7 +30,6 @@ > #include "clock.h" > #include "powerdomain.h" > #include "clockdomain.h" > -#include <plat/dmtimer.h> > #include "omap-pm.h" > > #include "soc.h" > diff --git a/drivers/staging/tidspbridge/core/ue_deh.c b/drivers/staging/tidspbridge/core/ue_deh.c > index 3d28b23..6aea6f1 100644 > --- a/drivers/staging/tidspbridge/core/ue_deh.c > +++ b/drivers/staging/tidspbridge/core/ue_deh.c > @@ -19,7 +19,6 @@ > > #include <linux/kernel.h> > #include <linux/interrupt.h> > -#include <plat/dmtimer.h> > > #include <dspbridge/dbdefs.h> > #include <dspbridge/dspdeh.h> Hi Omar, I should have had you in copy on this one. Are you ok with the removal of the above dmtimer.h include? It does not appear that this file needs to include dmtimer.h. Is it ok for this to go through Tony's tree? If so, care to ACK? Cheers Jon
Hi Jon, On 14 November 2012 09:53, Jon Hunter <jon-hunter@ti.com> wrote: >> diff --git a/drivers/staging/tidspbridge/core/ue_deh.c b/drivers/staging/tidspbridge/core/ue_deh.c >> index 3d28b23..6aea6f1 100644 >> --- a/drivers/staging/tidspbridge/core/ue_deh.c >> +++ b/drivers/staging/tidspbridge/core/ue_deh.c >> @@ -19,7 +19,6 @@ >> >> #include <linux/kernel.h> >> #include <linux/interrupt.h> >> -#include <plat/dmtimer.h> >> >> #include <dspbridge/dbdefs.h> >> #include <dspbridge/dspdeh.h> > > Hi Omar, I should have had you in copy on this one. Are you ok with the > removal of the above dmtimer.h include? It does not appear that this > file needs to include dmtimer.h. Indeed, we don't use it here. > Is it ok for this to go through Tony's tree? If so, care to ACK? Looks fine to me, but I believe you will want to let Greg know if this patch will bypass staging tree. Acked-by: Omar Ramirez Luna <omar.luna@linaro.org> Cheers, Omar
On Thu, Nov 15, 2012 at 02:42:13PM -0600, Omar Ramirez Luna wrote: > Hi Jon, > > On 14 November 2012 09:53, Jon Hunter <jon-hunter@ti.com> wrote: > >> diff --git a/drivers/staging/tidspbridge/core/ue_deh.c b/drivers/staging/tidspbridge/core/ue_deh.c > >> index 3d28b23..6aea6f1 100644 > >> --- a/drivers/staging/tidspbridge/core/ue_deh.c > >> +++ b/drivers/staging/tidspbridge/core/ue_deh.c > >> @@ -19,7 +19,6 @@ > >> > >> #include <linux/kernel.h> > >> #include <linux/interrupt.h> > >> -#include <plat/dmtimer.h> > >> > >> #include <dspbridge/dbdefs.h> > >> #include <dspbridge/dspdeh.h> > > > > Hi Omar, I should have had you in copy on this one. Are you ok with the > > removal of the above dmtimer.h include? It does not appear that this > > file needs to include dmtimer.h. > > Indeed, we don't use it here. > > > Is it ok for this to go through Tony's tree? If so, care to ACK? > > Looks fine to me, but I believe you will want to let Greg know if this > patch will bypass staging tree. That's fine with me for such trivial stuff. greg k-h
diff --git a/arch/arm/mach-omap1/timer32k.c b/arch/arm/mach-omap1/timer32k.c index 8936819..41152fa 100644 --- a/arch/arm/mach-omap1/timer32k.c +++ b/arch/arm/mach-omap1/timer32k.c @@ -51,7 +51,6 @@ #include <asm/mach/time.h> #include <plat/counter-32k.h> -#include <plat/dmtimer.h> #include <mach/hardware.h> diff --git a/arch/arm/mach-omap2/omap_hwmod_2420_data.c b/arch/arm/mach-omap2/omap_hwmod_2420_data.c index a8b3368..e8efe3d 100644 --- a/arch/arm/mach-omap2/omap_hwmod_2420_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_2420_data.c @@ -17,7 +17,6 @@ #include <linux/platform_data/spi-omap2-mcspi.h> #include <plat-omap/dma-omap.h> -#include <plat/dmtimer.h> #include "omap_hwmod.h" #include "l3_2xxx.h" diff --git a/arch/arm/mach-omap2/omap_hwmod_2430_data.c b/arch/arm/mach-omap2/omap_hwmod_2430_data.c index dc768c5..32d17e3 100644 --- a/arch/arm/mach-omap2/omap_hwmod_2430_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_2430_data.c @@ -18,7 +18,6 @@ #include <linux/platform_data/spi-omap2-mcspi.h> #include <plat-omap/dma-omap.h> -#include <plat/dmtimer.h> #include "omap_hwmod.h" #include "mmc.h" diff --git a/arch/arm/mach-omap2/pm-debug.c b/arch/arm/mach-omap2/pm-debug.c index 3cf4fdf..e2c291f 100644 --- a/arch/arm/mach-omap2/pm-debug.c +++ b/arch/arm/mach-omap2/pm-debug.c @@ -30,7 +30,6 @@ #include "clock.h" #include "powerdomain.h" #include "clockdomain.h" -#include <plat/dmtimer.h> #include "omap-pm.h" #include "soc.h" diff --git a/drivers/staging/tidspbridge/core/ue_deh.c b/drivers/staging/tidspbridge/core/ue_deh.c index 3d28b23..6aea6f1 100644 --- a/drivers/staging/tidspbridge/core/ue_deh.c +++ b/drivers/staging/tidspbridge/core/ue_deh.c @@ -19,7 +19,6 @@ #include <linux/kernel.h> #include <linux/interrupt.h> -#include <plat/dmtimer.h> #include <dspbridge/dbdefs.h> #include <dspbridge/dspdeh.h>
Some source files are including dmtimer.h but not actually using any dmtimer definitions or functions. Therefore, remove the inclusion dmtimer.h from these source files. Signed-off-by: Jon Hunter <jon-hunter@ti.com> --- arch/arm/mach-omap1/timer32k.c | 1 - arch/arm/mach-omap2/omap_hwmod_2420_data.c | 1 - arch/arm/mach-omap2/omap_hwmod_2430_data.c | 1 - arch/arm/mach-omap2/pm-debug.c | 1 - drivers/staging/tidspbridge/core/ue_deh.c | 1 - 5 files changed, 5 deletions(-)