From: mchehab@redhat.com (Mauro Carvalho Chehab)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 2/2] ARM: OMAP2+: Drop plat/cpu.h for omap2plus
Date: Mon, 17 Dec 2012 12:59:21 -0200 [thread overview]
Message-ID: <20121217125921.173cb306@redhat.com> (raw)
In-Reply-To: <20121216200317.24238.63954.stgit@muffinssi.local>
Em Sun, 16 Dec 2012 12:03:17 -0800
Tony Lindgren <tony@atomide.com> escreveu:
> The cpu_is_omap macros are now local to arch/arm/mach-omap2
> in soc.h and plat/cpu.h can finally be dropped for omap2+.
> Thanks everybody for help with fixing the drivers.
>
> Note that we can now also remove the unused plat/cpu.h from
> smartreflex.c and isp.c as they will cause compile errors
> with ARCH_MULTIPLATFORM enabled.
>
> Cc: Jean Pihet <jean.pihet@newoldbits.com>
> Cc: Kevin Hilman <khilman@deeprootsystems.com>
> Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> Cc: Mauro Carvalho Chehab <mchehab@redhat.com>
> Signed-off-by: Tony Lindgren <tony@atomide.com>
> ---
> arch/arm/mach-omap2/drm.c | 1 -
> arch/arm/mach-omap2/dss-common.c | 3 +--
> arch/arm/mach-omap2/prm2xxx.c | 3 +--
> arch/arm/mach-omap2/prm3xxx.c | 3 +--
> arch/arm/plat-omap/include/plat/cpu.h | 4 ----
> drivers/media/platform/omap3isp/isp.c | 2 --
Acked-by: Mauro Carvalho Chehab <mchehab@redhat.com>
> drivers/power/avs/smartreflex.c | 2 --
> 7 files changed, 3 insertions(+), 15 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/drm.c b/arch/arm/mach-omap2/drm.c
> index fce5aa3..4c7566c 100644
> --- a/arch/arm/mach-omap2/drm.c
> +++ b/arch/arm/mach-omap2/drm.c
> @@ -27,7 +27,6 @@
>
> #include "omap_device.h"
> #include "omap_hwmod.h"
> -#include <plat/cpu.h>
>
> #if defined(CONFIG_DRM_OMAP) || (CONFIG_DRM_OMAP_MODULE)
>
> diff --git a/arch/arm/mach-omap2/dss-common.c b/arch/arm/mach-omap2/dss-common.c
> index 679a047..4be5cfc 100644
> --- a/arch/arm/mach-omap2/dss-common.c
> +++ b/arch/arm/mach-omap2/dss-common.c
> @@ -31,8 +31,7 @@
> #include <video/omap-panel-nokia-dsi.h>
> #include <video/omap-panel-picodlp.h>
>
> -#include <plat/cpu.h>
> -
> +#include "soc.h"
> #include "dss-common.h"
> #include "mux.h"
>
> diff --git a/arch/arm/mach-omap2/prm2xxx.c b/arch/arm/mach-omap2/prm2xxx.c
> index faeab18..cc0e714 100644
> --- a/arch/arm/mach-omap2/prm2xxx.c
> +++ b/arch/arm/mach-omap2/prm2xxx.c
> @@ -18,9 +18,8 @@
> #include <linux/io.h>
> #include <linux/irq.h>
>
> +#include "soc.h"
> #include "common.h"
> -#include <plat/cpu.h>
> -
> #include "vp.h"
> #include "powerdomain.h"
> #include "clockdomain.h"
> diff --git a/arch/arm/mach-omap2/prm3xxx.c b/arch/arm/mach-omap2/prm3xxx.c
> index db198d0..39822aa 100644
> --- a/arch/arm/mach-omap2/prm3xxx.c
> +++ b/arch/arm/mach-omap2/prm3xxx.c
> @@ -18,9 +18,8 @@
> #include <linux/io.h>
> #include <linux/irq.h>
>
> +#include "soc.h"
> #include "common.h"
> -#include <plat/cpu.h>
> -
> #include "vp.h"
> #include "powerdomain.h"
> #include "prm3xxx.h"
> diff --git a/arch/arm/plat-omap/include/plat/cpu.h b/arch/arm/plat-omap/include/plat/cpu.h
> index b4516ab..c9a66bf 100644
> --- a/arch/arm/plat-omap/include/plat/cpu.h
> +++ b/arch/arm/plat-omap/include/plat/cpu.h
> @@ -32,8 +32,4 @@
> #include <mach/soc.h>
> #endif
>
> -#ifdef CONFIG_ARCH_OMAP2PLUS
> -#include "../../mach-omap2/soc.h"
> -#endif
> -
> #endif
> diff --git a/drivers/media/platform/omap3isp/isp.c b/drivers/media/platform/omap3isp/isp.c
> index a9f6de5..2e8c0cb 100644
> --- a/drivers/media/platform/omap3isp/isp.c
> +++ b/drivers/media/platform/omap3isp/isp.c
> @@ -71,8 +71,6 @@
> #include <media/v4l2-common.h>
> #include <media/v4l2-device.h>
>
> -#include <plat/cpu.h>
> -
> #include "isp.h"
> #include "ispreg.h"
> #include "ispccdc.h"
> diff --git a/drivers/power/avs/smartreflex.c b/drivers/power/avs/smartreflex.c
> index a17d084..6b2238b 100644
> --- a/drivers/power/avs/smartreflex.c
> +++ b/drivers/power/avs/smartreflex.c
> @@ -27,8 +27,6 @@
> #include <linux/pm_runtime.h>
> #include <linux/power/smartreflex.h>
>
> -#include <plat/cpu.h>
> -
> #define SMARTREFLEX_NAME_LEN 16
> #define NVALUE_NAME_LEN 40
> #define SR_DISABLE_TIMEOUT 200
>
--
Cheers,
Mauro
next prev parent reply other threads:[~2012-12-17 14:59 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-16 20:03 [PATCH 0/2] drop plat/cpu.h for omap2plus Tony Lindgren
2012-12-16 20:03 ` [PATCH 1/2] ARM: OMAP: Split vrfb.c to remove last remaining cpu_is_omap usage Tony Lindgren
2012-12-17 9:31 ` Tomi Valkeinen
2012-12-17 17:19 ` Tony Lindgren
2012-12-16 20:03 ` [PATCH 2/2] ARM: OMAP2+: Drop plat/cpu.h for omap2plus Tony Lindgren
2012-12-17 9:04 ` Laurent Pinchart
2012-12-17 10:48 ` Jean Pihet
2012-12-17 14:59 ` Mauro Carvalho Chehab [this message]
2012-12-20 6:42 ` [PATCH 0/2] drop " Santosh Shilimkar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20121217125921.173cb306@redhat.com \
--to=mchehab@redhat.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).