[PATCH]omap: i2c: Avoid compilation error in case the header is included multiple times

[PATCH]omap: i2c: Avoid compilation error in case the header is included multiple times

[C.A, Subramaniam]

>From e3c3ee9317850b2b26e02680a0c976d3c75febab Mon Sep 17 00:00:00 2001
From: Subramaniam C.A <subramaniam.ca@ti.com>
Date: Tue, 24 Aug 2010 12:02:28 -0500
Subject: [PATCH] omap: i2c: Avoid compilation error in case the header is included multiple times.

Added defines to avoid compilation error.

Signed-off-by: Subramaniam C.A <subramaniam.ca@ti.com>
---
 arch/arm/plat-omap/include/plat/i2c.h |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/arch/arm/plat-omap/include/plat/i2c.h b/arch/arm/plat-omap/include/plat/i2c.h
index 9e085f1..5d67273 100644
--- a/arch/arm/plat-omap/include/plat/i2c.h
+++ b/arch/arm/plat-omap/include/plat/i2c.h
@@ -18,6 +18,8 @@
  * 02110-1301 USA
  *
  */
+#ifndef __ASM__ARCH_OMAP_I2C_H
+#define __ASM__ARCH_OMAP_I2C_H

 #include <linux/i2c.h>

@@ -57,3 +59,5 @@ struct omap_i2c_dev_attr {

 void __init omap1_i2c_mux_pins(int bus_id);
 void __init omap2_i2c_mux_pins(int bus_id);
+
+#endif /* __ASM__ARCH_OMAP_I2C_H */
--
1.7.0.4

BR
Subbu

Re: [PATCH]omap: i2c: Avoid compilation error in case the header is included multiple times

[Felipe Balbi]

On Tue, Aug 24, 2010 at 07:14:30PM +0200, ext C.A, Subramaniam wrote:
>>From e3c3ee9317850b2b26e02680a0c976d3c75febab Mon Sep 17 00:00:00 2001
>From: Subramaniam C.A <subramaniam.ca@ti.com>
>Date: Tue, 24 Aug 2010 12:02:28 -0500
>Subject: [PATCH] omap: i2c: Avoid compilation error in case the header is included multiple times.
>
>Added defines to avoid compilation error.
>

could you list one such case ?

>Signed-off-by: Subramaniam C.A <subramaniam.ca@ti.com>

Acked-by: Felipe Balbi <felipe.balbi@nokia.com>

-- 
balbi

DefectiveByDesign.org

RE: [PATCH]omap: i2c: Avoid compilation error in case the header is included multiple times

[C.A, Subramaniam]

Hi Felipe,

> -----Original Message-----
> From: Felipe Balbi [mailto:felipe.balbi@nokia.com] 
> Sent: Tuesday, August 24, 2010 1:49 PM
> To: C.A, Subramaniam
> Cc: linux-omap@vger.kernel.org; Gadiyar, Anand; tony@atomide.com
> Subject: Re: [PATCH]omap: i2c: Avoid compilation error in 
> case the header is included multiple times
> 
> On Tue, Aug 24, 2010 at 07:14:30PM +0200, ext C.A, Subramaniam wrote:
> >>From e3c3ee9317850b2b26e02680a0c976d3c75febab Mon Sep 17 
> 00:00:00 2001
> >From: Subramaniam C.A <subramaniam.ca@ti.com>
> >Date: Tue, 24 Aug 2010 12:02:28 -0500
> >Subject: [PATCH] omap: i2c: Avoid compilation error in case 
> the header is included multiple times.
> >
> >Added defines to avoid compilation error.
> >
> 
> could you list one such case ?
This caused a compilation error for the OMAP4 tree, where the ipu_pm.c file was including plat/i2c.h and plat/omap-pm.h.
Ref: http://dev.omapzoom.org/?p=integration/kernel-omap4.git;a=blob;f=drivers/dsp/syslink/ipu_pm/ipu_pm.c;h=b1791d4e7f2113eed046d3785106360dbe1cfc86;hb=d67c37aaadb80a6209f07618302bb84e1c952e97

omap-pm.h indirectly includes plat/i2c.h and hence the compilation error.

Yes we could have removed the,

#include <plat/i2c.h>

from the ipu_pm.c file and avoided the compilation error, but it still made sense to have this patch.

> 
> >Signed-off-by: Subramaniam C.A <subramaniam.ca@ti.com>
> 
> Acked-by: Felipe Balbi <felipe.balbi@nokia.com>
> 
> --
> balbi
> 
> DefectiveByDesign.org
> 

BR
Subbu

[APPLIED] [PATCH]omap: i2c: Avoid compilation error in case the header is

[Tony Lindgren]

This patch has been applied to the linux-omap
by youw fwiendly patch wobot.

Branch in linux-omap: devel-omap-misc

Initial commit ID (Likely to change): 6ce3fc011cdd5b7eb72d0cacb236bbfa51f17dad

PatchWorks
http://patchwork.kernel.org/patch/127371/

Git (Likely to change, and takes a while to get mirrored)
http://git.kernel.org/?p=linux/kernel/git/tmlind/linux-omap-2.6.git;a=commit;h=6ce3fc011cdd5b7eb72d0cacb236bbfa51f17dad