Re: [i2c] [PATCH 7/8] i2c-omap: Don't compile in OMAP15xx I2C ISR for non-OMAP15xx builds
* Paul Walmsley <[EMAIL PROTECTED]> [080929 22:36]:
> On Mon, 29 Sep 2008, Paul Walmsley wrote:
>
> > Hello Ben, David,
> >
> > On Mon, 29 Sep 2008, David Brownell wrote:
> >
> > > On Monday 29 September 2008, Ben Dooks wrote:
> > > > > -static void __exit omap_i2c_exit_driver(void)
> > > > > +static void __devexit omap_i2c_exit_driver(void)
> > > >
> > > > a differerent change to the one advertised.
> > > >
> > > > > {
> > > > > platform_driver_unregister(&omap_i2c_driver);
> > > > > }
> > >
> > > And incorrect too.
> >
> > Indeed, will split and resubmit.
>
> (and change to __init/__exit)
Here's this one with the __init/__exit changes removed.
Tony
>From 6e8249e9d1aa28bda2c0123542582104635a0a83 Mon Sep 17 00:00:00 2001
From: Paul Walmsley <[EMAIL PROTECTED]>
Date: Fri, 17 Oct 2008 07:46:56 -0700
Subject: [PATCH] i2c-omap: Don't compile in OMAP15xx I2C ISR for non-OMAP15xx builds
Skip compiling OMAP15xx I2C ISR for non-OMAP15xx builds. Saves 400 bytes
of text for most OMAP builds.
Signed-off-by: Paul Walmsley <[EMAIL PROTECTED]>
Signed-off-by: Tony Lindgren <[EMAIL PROTECTED]>
---
drivers/i2c/busses/i2c-omap.c |6 ++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index 018d284..5560064 100644
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@ -506,6 +506,9 @@ omap_i2c_ack_stat(struct omap_i2c_dev *dev, u16 stat)
omap_i2c_write_reg(dev, OMAP_I2C_STAT_REG, stat);
}
+/* rev1 devices are apparently only on some 15xx */
+#ifdef CONFIG_ARCH_OMAP15XX
+
static irqreturn_t
omap_i2c_rev1_isr(int this_irq, void *dev_id)
{
@@ -560,6 +563,9 @@ omap_i2c_rev1_isr(int this_irq, void *dev_id)
return IRQ_HANDLED;
}
+#else
+#define omap_i2c_rev1_isr 0
+#endif
static irqreturn_t
omap_i2c_isr(int this_irq, void *dev_id)
--
1.5.6.rc3.21.g8c6b5
Re: [i2c] [PATCH 7/8] i2c-omap: Don't compile in OMAP15xx I2C ISR for non-OMAP15xx builds
On Mon, 29 Sep 2008, Paul Walmsley wrote:
> Hello Ben, David,
>
> On Mon, 29 Sep 2008, David Brownell wrote:
>
> > On Monday 29 September 2008, Ben Dooks wrote:
> > > > -static void __exit omap_i2c_exit_driver(void)
> > > > +static void __devexit omap_i2c_exit_driver(void)
> > >
> > > a differerent change to the one advertised.
> > >
> > > > {
> > > > platform_driver_unregister(&omap_i2c_driver);
> > > > }
> >
> > And incorrect too.
>
> Indeed, will split and resubmit.
(and change to __init/__exit)
- Paul
Re: [i2c] [PATCH 7/8] i2c-omap: Don't compile in OMAP15xx I2C ISR for non-OMAP15xx builds
Hello Ben, David,
On Mon, 29 Sep 2008, David Brownell wrote:
> On Monday 29 September 2008, Ben Dooks wrote:
> > > -static void __exit omap_i2c_exit_driver(void)
> > > +static void __devexit omap_i2c_exit_driver(void)
> >
> > a differerent change to the one advertised.
> >
> > > {
> > > platform_driver_unregister(&omap_i2c_driver);
> > > }
>
> And incorrect too.
Indeed, will split and resubmit.
- Paul
Re: [i2c] [PATCH 7/8] i2c-omap: Don't compile in OMAP15xx I2C ISR for non-OMAP15xx builds
On Monday 29 September 2008, Ben Dooks wrote:
> > -static void __exit omap_i2c_exit_driver(void)
> > +static void __devexit omap_i2c_exit_driver(void)
>
> a differerent change to the one advertised.
>
> > {
> > platform_driver_unregister(&omap_i2c_driver);
> > }
And incorrect too.
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [i2c] [PATCH 7/8] i2c-omap: Don't compile in OMAP15xx I2C ISR for non-OMAP15xx builds
On Thu, Sep 25, 2008 at 10:53:53AM +0300, Tony Lindgren wrote:
> From: Paul Walmsley <[EMAIL PROTECTED]>
>
> Skip compiling OMAP15xx I2C ISR for non-OMAP15xx builds. Saves 400 bytes
> of text for most OMAP builds.
you've sneaked in __devinit/__devexit changes into this patch,
I'm going to put my foot down on that.
> Signed-off-by: Paul Walmsley <[EMAIL PROTECTED]>
> Signed-off-by: Tony Lindgren <[EMAIL PROTECTED]>
> ---
> drivers/i2c/busses/i2c-omap.c | 10 --
> 1 files changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
> index e71f1f2..5c54864 100644
> --- a/drivers/i2c/busses/i2c-omap.c
> +++ b/drivers/i2c/busses/i2c-omap.c
> @@ -511,6 +511,9 @@ omap_i2c_ack_stat(struct omap_i2c_dev *dev, u16 stat)
> omap_i2c_write_reg(dev, OMAP_I2C_STAT_REG, stat);
> }
>
> +/* rev1 devices are apparently only on some 15xx */
> +#ifdef CONFIG_ARCH_OMAP15XX
> +
> static irqreturn_t
> omap_i2c_rev1_isr(int this_irq, void *dev_id)
> {
> @@ -565,6 +568,9 @@ omap_i2c_rev1_isr(int this_irq, void *dev_id)
>
> return IRQ_HANDLED;
> }
> +#else
> +#define omap_i2c_rev1_isr0
> +#endif
>
> static irqreturn_t
> omap_i2c_isr(int this_irq, void *dev_id)
> @@ -843,14 +849,14 @@ static struct platform_driver omap_i2c_driver = {
> };
>
> /* I2C may be needed to bring up other drivers */
> -static int __init
> +static int __devinit
> omap_i2c_init_driver(void)
> {
> return platform_driver_register(&omap_i2c_driver);
> }
> subsys_initcall(omap_i2c_init_driver);
>
> -static void __exit omap_i2c_exit_driver(void)
> +static void __devexit omap_i2c_exit_driver(void)
a differerent change to the one advertised.
> {
> platform_driver_unregister(&omap_i2c_driver);
> }
> --
> 1.5.6.rc3.21.g8c6b5
>
>
> ___
> i2c mailing list
> [EMAIL PROTECTED]
> http://lists.lm-sensors.org/mailman/listinfo/i2c
--
Ben ([EMAIL PROTECTED], http://www.fluff.org/)
'a smiley only costs 4 bytes'
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
