From: Tony Lindgren <tony@atomide.com>
To: Sanjeev Premi <premi@ti.com>
Cc: linux-omap@vger.kernel.org
Subject: Re: [PATCH] Remove duplicate definitions
Date: Wed, 17 Jun 2009 02:34:42 -0700 [thread overview]
Message-ID: <20090617093441.GH6605@atomide.com> (raw)
In-Reply-To: <20090617085214.GG6605@atomide.com>
* Tony Lindgren <tony@atomide.com> [090617 01:52]:
> * Sanjeev Premi <premi@ti.com> [090616 04:15]:
> > Fixes the duplicate definitions of KEY and PERSISTENT_KEY
> > leading to these compile-time warnings:
> >
> > In file included from arch/arm/mach-omap2/board-omap3evm.c:39:
> > arch/arm/plat-omap/include/mach/keypad.h:38:1: warning: "KEY" redefined
> > In file included from arch/arm/mach-omap2/board-omap3evm.c:27:
> > include/linux/i2c/twl4030.h:341:1: warning: this is the location of the previous definition
> > In file included from arch/arm/mach-omap2/board-omap3evm.c:39:
> > arch/arm/plat-omap/include/mach/keypad.h:39:1: warning: "PERSISTENT_KEY" redefined
> > In file included from arch/arm/mach-omap2/board-omap3evm.c:27:
> > include/linux/i2c/twl4030.h:342:1: warning: this is the location of the previous definition
>
> Hmm, I think we should rather remove these from keypad.h. Will queue
> a patch into omap-fixes for that.
Sorry, you're right, looks like we have still non-standard headers
for I2C. Will reset those in linux-omap tree.
> Tony
>
> > Signed-off-by: Sanjeev Premi <premi@ti.com>
> > ---
> > include/linux/i2c/twl4030.h | 8 --------
> > 1 files changed, 0 insertions(+), 8 deletions(-)
> >
> > diff --git a/include/linux/i2c/twl4030.h b/include/linux/i2c/twl4030.h
> > index 87accda..21e65bf 100644
> > --- a/include/linux/i2c/twl4030.h
> > +++ b/include/linux/i2c/twl4030.h
> > @@ -333,14 +333,6 @@ struct twl4030_madc_platform_data {
> > int irq_line;
> > };
> >
> > -/* Boards have uniqe mappings of {col, row} --> keycode.
> > - * Column and row are 4 bits, but range only from 0..7;
> > - * a PERSISTENT_KEY is "always on" and never reported.
> > - */
> > -#define KEY_PERSISTENT 0x00800000
> > -#define KEY(col, row, keycode) (((col) << 28) | ((row) << 24) | (keycode))
> > -#define PERSISTENT_KEY(c, r) KEY(c, r, KEY_PERSISTENT)
> > -
> > struct twl4030_keypad_data {
> > unsigned rows;
> > unsigned cols;
> > --
> > 1.6.2.2
> >
> > --
> > To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> > the body of a message to majordomo@vger.kernel.org
> > More majordomo info at http://vger.kernel.org/majordomo-info.html
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
prev parent reply other threads:[~2009-06-17 9:34 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-06-16 11:14 [PATCH] Remove duplicate definitions Sanjeev Premi
2009-06-17 8:52 ` Tony Lindgren
2009-06-17 9:34 ` Tony Lindgren [this message]
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=20090617093441.GH6605@atomide.com \
--to=tony@atomide.com \
--cc=linux-omap@vger.kernel.org \
--cc=premi@ti.com \
/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