[PATCH V2 1/4] i2c: tegra: Add __devinit/exit to probe/remove

[PATCH V2 1/4] i2c: tegra: Add __devinit/exit to probe/remove

[Stephen Warren]

This fixes some section mismatch build warnings.

Signed-off-by: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
---
v2: New patch.

 drivers/i2c/busses/i2c-tegra.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c
index 46b6500..e8560ed 100644
--- a/drivers/i2c/busses/i2c-tegra.c
+++ b/drivers/i2c/busses/i2c-tegra.c
@@ -558,7 +558,7 @@ static const struct i2c_algorithm tegra_i2c_algo = {
 	.functionality	= tegra_i2c_func,
 };
 
-static int tegra_i2c_probe(struct platform_device *pdev)
+static int __devinit tegra_i2c_probe(struct platform_device *pdev)
 {
 	struct tegra_i2c_dev *i2c_dev;
 	struct tegra_i2c_platform_data *pdata = pdev->dev.platform_data;
@@ -690,7 +690,7 @@ err_iounmap:
 	return ret;
 }
 
-static int tegra_i2c_remove(struct platform_device *pdev)
+static int __devexit tegra_i2c_remove(struct platform_device *pdev)
 {
 	struct tegra_i2c_dev *i2c_dev = platform_get_drvdata(pdev);
 	i2c_del_adapter(&i2c_dev->adapter);
-- 
1.7.5.4

[PATCH V2 2/4] i2c: tegra: Support DVC controller in device tree

[Stephen Warren]

One of the Tegra I2C blocks is inside the DVC (Digital Voltage Controller)
block. This block is identical to the rest of the I2C blocks, except that
it only supports master mode, it has registers moved around, and it needs
some extra init to get it into I2C mode.  The register moves are handled
by i2c_readl and i2c_writel

This patch adds a new compatible value for controllers of this "DVC"
type; I figured that this approach was reasonable, as opposed to adding
an is-dvc property under the existing compatible value, since the HW
truly is different.

v2: Call of_device_is_compatible() to determine is_dvc, instead of storing
the flag in tegra_i2c_of_match[]'s .data field.

Signed-off-by: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
---
 drivers/i2c/busses/i2c-tegra.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c
index e8560ed..6381604 100644
--- a/drivers/i2c/busses/i2c-tegra.c
+++ b/drivers/i2c/busses/i2c-tegra.c
@@ -636,7 +636,10 @@ static int __devinit tegra_i2c_probe(struct platform_device *pdev)
 			i2c_dev->bus_clk_rate = be32_to_cpup(prop);
 	}
 
-	if (pdev->id == 3)
+	if (pdev->dev.of_node)
+		i2c_dev->is_dvc = of_device_is_compatible(pdev->dev.of_node,
+						"nvidia,tegra20-i2c-dvc");
+	else if (pdev->id == 3)
 		i2c_dev->is_dvc = 1;
 	init_completion(&i2c_dev->msg_complete);
 
@@ -742,6 +745,7 @@ static int tegra_i2c_resume(struct platform_device *pdev)
 /* Match table for of_platform binding */
 static const struct of_device_id tegra_i2c_of_match[] __devinitconst = {
 	{ .compatible = "nvidia,tegra20-i2c", },
+	{ .compatible = "nvidia,tegra20-i2c-dvc", },
 	{},
 };
 MODULE_DEVICE_TABLE(of, tegra_i2c_of_match);
-- 
1.7.5.4

Re: [PATCH V2 2/4] i2c: tegra: Support DVC controller in device tree

[Olof Johansson]

On Sat, Dec 17, 2011 at 11:29:30PM -0700, Stephen Warren wrote:
> One of the Tegra I2C blocks is inside the DVC (Digital Voltage Controller)
> block. This block is identical to the rest of the I2C blocks, except that
> it only supports master mode, it has registers moved around, and it needs
> some extra init to get it into I2C mode.  The register moves are handled
> by i2c_readl and i2c_writel
> 
> This patch adds a new compatible value for controllers of this "DVC"
> type; I figured that this approach was reasonable, as opposed to adding
> an is-dvc property under the existing compatible value, since the HW
> truly is different.
> 
> v2: Call of_device_is_compatible() to determine is_dvc, instead of storing
> the flag in tegra_i2c_of_match[]'s .data field.
> 
> Signed-off-by: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
> ---

I've applied this one as well to the tegra for-3.3/drivers. Ben, let me know if
you want it through your tree but since it mostly fixes device tree usage
I figured it's OK for us to take.


-Olof

[PATCH V2 3/4] arm/dt: tegra: Use new compatible value for DVC I2C controller

[Stephen Warren]

Update the device tree to indicate which I2C controller is the DVC
controller. AUXDATA needs to be updated too, since the compatible
value changed.

Signed-off-by: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
---
v2: No change

 arch/arm/boot/dts/tegra20.dtsi |    2 +-
 arch/arm/mach-tegra/board-dt.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/boot/dts/tegra20.dtsi b/arch/arm/boot/dts/tegra20.dtsi
index 660c8ad..3da7afd 100644
--- a/arch/arm/boot/dts/tegra20.dtsi
+++ b/arch/arm/boot/dts/tegra20.dtsi
@@ -39,7 +39,7 @@
 	i2c@7000d000 {
 		#address-cells = <1>;
 		#size-cells = <0>;
-		compatible = "nvidia,tegra20-i2c";
+		compatible = "nvidia,tegra20-i2c-dvc";
 		reg = <0x7000D000 0x200>;
 		interrupts = < 0 53 0x04 >;
 	};
diff --git a/arch/arm/mach-tegra/board-dt.c b/arch/arm/mach-tegra/board-dt.c
index b44633b..9abc89d 100644
--- a/arch/arm/mach-tegra/board-dt.c
+++ b/arch/arm/mach-tegra/board-dt.c
@@ -74,7 +74,7 @@ struct of_dev_auxdata tegra20_auxdata_lookup[] __initdata = {
 	OF_DEV_AUXDATA("nvidia,tegra20-i2c", TEGRA_I2C_BASE, "tegra-i2c.0", NULL),
 	OF_DEV_AUXDATA("nvidia,tegra20-i2c", TEGRA_I2C2_BASE, "tegra-i2c.1", NULL),
 	OF_DEV_AUXDATA("nvidia,tegra20-i2c", TEGRA_I2C3_BASE, "tegra-i2c.2", NULL),
-	OF_DEV_AUXDATA("nvidia,tegra20-i2c", TEGRA_DVC_BASE, "tegra-i2c.3", NULL),
+	OF_DEV_AUXDATA("nvidia,tegra20-i2c-dvc", TEGRA_DVC_BASE, "tegra-i2c.3", NULL),
 	OF_DEV_AUXDATA("nvidia,tegra20-i2s", TEGRA_I2S1_BASE, "tegra-i2s.0", NULL),
 	OF_DEV_AUXDATA("nvidia,tegra20-i2s", TEGRA_I2S2_BASE, "tegra-i2s.1", NULL),
 	OF_DEV_AUXDATA("nvidia,tegra20-das", TEGRA_APB_MISC_DAS_BASE, "tegra-das", NULL),
-- 
1.7.5.4

Re: [PATCH V2 3/4] arm/dt: tegra: Use new compatible value for DVC I2C controller

[Olof Johansson]

On Sat, Dec 17, 2011 at 11:29:31PM -0700, Stephen Warren wrote:
> Update the device tree to indicate which I2C controller is the DVC
> controller. AUXDATA needs to be updated too, since the compatible
> value changed.
> 
> Signed-off-by: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>

Thanks, applied to for-3.3/dt.


-Olof

[PATCH V2 4/4] arm/dt: Add ADT7461 to Seaboard

[Stephen Warren]

The ADT7461 is a temperature monitoring IC. One is present on the DVC
I2C bus on Seaboard.

Signed-off-by: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
---
v2: No change

 arch/arm/boot/dts/tegra-seaboard.dts |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/arch/arm/boot/dts/tegra-seaboard.dts b/arch/arm/boot/dts/tegra-seaboard.dts
index 3cfbd04..b55a02e 100644
--- a/arch/arm/boot/dts/tegra-seaboard.dts
+++ b/arch/arm/boot/dts/tegra-seaboard.dts
@@ -25,6 +25,11 @@
 
 	i2c@7000d000 {
 		clock-frequency = <400000>;
+
+		adt7461@4c {
+			compatible = "adt7461";
+			reg = <0x4c>;
+		};
 	};
 
 	serial@70006000 {
-- 
1.7.5.4

Re: [PATCH V2 4/4] arm/dt: Add ADT7461 to Seaboard

[Olof Johansson]

On Sat, Dec 17, 2011 at 11:29:32PM -0700, Stephen Warren wrote:
> The ADT7461 is a temperature monitoring IC. One is present on the DVC
> I2C bus on Seaboard.
> 
> Signed-off-by: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>

Thanks, applied to for-3.3/dt.


-Olof

Re: [PATCH V2 1/4] i2c: tegra: Add __devinit/exit to probe/remove

[Shubhrajyoti Datta]

On Sun, Dec 18, 2011 at 11:59 AM, Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org> wrote:
> This fixes some section mismatch build warnings.
What was the error was a devinit function called from these?

>
> Signed-off-by: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
> ---
> v2: New patch.
>
>  drivers/i2c/busses/i2c-tegra.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c
> index 46b6500..e8560ed 100644
> --- a/drivers/i2c/busses/i2c-tegra.c
> +++ b/drivers/i2c/busses/i2c-tegra.c
> @@ -558,7 +558,7 @@ static const struct i2c_algorithm tegra_i2c_algo = {
>        .functionality  = tegra_i2c_func,
>  };
>
> -static int tegra_i2c_probe(struct platform_device *pdev)
> +static int __devinit tegra_i2c_probe(struct platform_device *pdev)
>  {
>        struct tegra_i2c_dev *i2c_dev;
>        struct tegra_i2c_platform_data *pdata = pdev->dev.platform_data;
> @@ -690,7 +690,7 @@ err_iounmap:
>        return ret;
>  }
>
> -static int tegra_i2c_remove(struct platform_device *pdev)
> +static int __devexit tegra_i2c_remove(struct platform_device *pdev)
>  {
>        struct tegra_i2c_dev *i2c_dev = platform_get_drvdata(pdev);
>        i2c_del_adapter(&i2c_dev->adapter);
> --
> 1.7.5.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-i2c" in
> the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

RE: [PATCH V2 1/4] i2c: tegra: Add __devinit/exit to probe/remove

[Stephen Warren]

Shubhrajyoti Datta wrote at Sunday, December 18, 2011 11:54 PM:
> On Sun, Dec 18, 2011 at 11:59 AM, Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org> wrote:
> > This fixes some section mismatch build warnings.
>
> What was the error was a devinit function called from these?

As I Understand It, probe/remove are devinit/exit functions, and hence
should be marked as such.

The errors were from building with CONFIG_DEBUG_SECTION_MISMATCH=y.

I guess the section mismatch errors won't actually show up in the code
that's in the kernel right now; they only showed up because I had a local
patch that modified probe() to reference tegra_i2c_of_match[] which is
__devinitconst. I since reworked that patch so that it doesn't introduce
that reference, for other reasons. Still, I think this is a good cleanup
change even if nothing is actually causing these mismatch errors to fire
right now.

-- 
nvpublic

Re: [PATCH V2 1/4] i2c: tegra: Add __devinit/exit to probe/remove

[Olof Johansson]

On Sat, Dec 17, 2011 at 11:29:29PM -0700, Stephen Warren wrote:
> This fixes some section mismatch build warnings.
> 
> Signed-off-by: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>

Ben, since the patch is trivial, I've picked it up in tegra
for-3.3/drivers and will merge that way. Let me know if you disagree.


Thanks,

-Olof

Re: [PATCH V2 1/4] i2c: tegra: Add __devinit/exit to probe/remove

[Shubhrajyoti Datta]

On Tue, Dec 20, 2011 at 7:26 AM, Olof Johansson <olof-nZhT3qVonbNeoWH0uzbU5w@public.gmane.org> wrote:
> On Sat, Dec 17, 2011 at 11:29:29PM -0700, Stephen Warren wrote:
>> This fixes some section mismatch build warnings.
>>
>> Signed-off-by: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
>
> Ben, since the patch is trivial, I've picked it up in tegra
> for-3.3/drivers and will merge that way. Let me know if you disagree.
>
>
Hi Stephen ,
could you check this one also
thanks.

From: Shubhrajyoti D <shubhrajyoti-l0cyMroinI0@public.gmane.org>
Date: Tue, 20 Dec 2011 11:40:51 +0530
Subject: [PATCH] I2C : tegra : devexit in remove

Adding I2C __devexxit in remove

Cc: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
Signed-off-by: Shubhrajyoti D <shubhrajyoti-l0cyMroinI0@public.gmane.org>
---
Untested

 drivers/i2c/busses/i2c-tegra.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c
index 46b6500..b25f78b 100644
--- a/drivers/i2c/busses/i2c-tegra.c
+++ b/drivers/i2c/busses/i2c-tegra.c
@@ -751,7 +751,7 @@ MODULE_DEVICE_TABLE(of, tegra_i2c_of_match);

 static struct platform_driver tegra_i2c_driver = {
        .probe   = tegra_i2c_probe,
-       .remove  = tegra_i2c_remove,
+       .remove  =__devexit_p(tegra_i2c_remove),
 #ifdef CONFIG_PM
        .suspend = tegra_i2c_suspend,
        .resume  = tegra_i2c_resume,
-- 
1.7.1

> Thanks,
>
> -Olof
> --
> To unsubscribe from this list: send the line "unsubscribe linux-i2c" in
> the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

RE: [PATCH V2 1/4] i2c: tegra: Add __devinit/exit to probe/remove

[Stephen Warren]

Shubhrajyoti Datta wrote at Monday, December 19, 2011 11:15 PM:
...
> Hi Stephen ,
> could you check this one also
> thanks.
> 
> From: Shubhrajyoti D <shubhrajyoti-l0cyMroinI0@public.gmane.org>
> Date: Tue, 20 Dec 2011 11:40:51 +0530
> Subject: [PATCH] I2C : tegra : devexit in remove
> 
> Adding I2C __devexxit in remove
> 
> Cc: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
> Signed-off-by: Shubhrajyoti D <shubhrajyoti-l0cyMroinI0@public.gmane.org>

Acked-by: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>

Ben or Olof,

> -       .remove  = tegra_i2c_remove,
> +       .remove  =__devexit_p(tegra_i2c_remove),

When you apply this, can you fix it up to add a space after the = in
the modified line? If you want, I can post an updated version to do that.

-- 
nvpublic

Re: [PATCH V2 1/4] i2c: tegra: Add __devinit/exit to probe/remove

[Ben Dooks]

On Tue, Dec 20, 2011 at 01:47:29PM -0800, Stephen Warren wrote:
> Shubhrajyoti Datta wrote at Monday, December 19, 2011 11:15 PM:
> ...
> > Hi Stephen ,
> > could you check this one also
> > thanks.
> > 
> > From: Shubhrajyoti D <shubhrajyoti-l0cyMroinI0@public.gmane.org>
> > Date: Tue, 20 Dec 2011 11:40:51 +0530
> > Subject: [PATCH] I2C : tegra : devexit in remove
> > 
> > Adding I2C __devexxit in remove
> > 
> > Cc: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
> > Signed-off-by: Shubhrajyoti D <shubhrajyoti-l0cyMroinI0@public.gmane.org>
> 
> Acked-by: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
> 
> Ben or Olof,
> 
> > -       .remove  = tegra_i2c_remove,
> > +       .remove  =__devexit_p(tegra_i2c_remove),
> 
> When you apply this, can you fix it up to add a space after the = in
> the modified line? If you want, I can post an updated version to do that.

Let me know if you want anything applying or a pull-request processed.

I think once fixed the patches would be fine and I ack them:

Acked-by: Ben Dooks <ben-linux-elnMNo+KYs3YtjvyW6yDsg@public.gmane.org>
 
> -- 
> nvpublic
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-i2c" in
> the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

-- 
Ben Dooks, ben-elnMNo+KYs3YtjvyW6yDsg@public.gmane.org, http://www.fluff.org/ben/

Large Hadron Colada: A large Pina Colada that makes the universe disappear.

RE: [PATCH V2 1/4] i2c: tegra: Add __devinit/exit to probe/remove

[Stephen Warren]

Ben Dooks wrote at Friday, January 06, 2012 9:26 AM:
> On Tue, Dec 20, 2011 at 01:47:29PM -0800, Stephen Warren wrote:
> > Shubhrajyoti Datta wrote at Monday, December 19, 2011 11:15 PM:
> > ...
> > > Hi Stephen ,
> > > could you check this one also
> > > thanks.
> > >
> > > From: Shubhrajyoti D <shubhrajyoti-l0cyMroinI0@public.gmane.org>
> > > Date: Tue, 20 Dec 2011 11:40:51 +0530
> > > Subject: [PATCH] I2C : tegra : devexit in remove
> > >
> > > Adding I2C __devexxit in remove
> > >
> > > Cc: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
> > > Signed-off-by: Shubhrajyoti D <shubhrajyoti-l0cyMroinI0@public.gmane.org>
> >
> > Acked-by: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
> >
> > Ben or Olof,
> >
> > > -       .remove  = tegra_i2c_remove,
> > > +       .remove  =__devexit_p(tegra_i2c_remove),
> >
> > When you apply this, can you fix it up to add a space after the = in
> > the modified line? If you want, I can post an updated version to do that.
> 
> Let me know if you want anything applying or a pull-request processed.
> 
> I think once fixed the patches would be fine and I ack them:
> 
> Acked-by: Ben Dooks <ben-linux-elnMNo+KYs3YtjvyW6yDsg@public.gmane.org>

Olof, since you took the original through the Tegra tree, I think it
makes sense for us to take this fix through there too, and for 3.3?
The patch above is http://patchwork.ozlabs.org/patch/132349/

-- 
nvpublic

Re: [PATCH V2 1/4] i2c: tegra: Add __devinit/exit to probe/remove

[Olof Johansson]

On Fri, Jan 6, 2012 at 8:47 AM, Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org> wrote:
> Ben Dooks wrote at Friday, January 06, 2012 9:26 AM:
>> On Tue, Dec 20, 2011 at 01:47:29PM -0800, Stephen Warren wrote:
>> > Shubhrajyoti Datta wrote at Monday, December 19, 2011 11:15 PM:
>> > ...
>> > > Hi Stephen ,
>> > > could you check this one also
>> > > thanks.
>> > >
>> > > From: Shubhrajyoti D <shubhrajyoti-l0cyMroinI0@public.gmane.org>
>> > > Date: Tue, 20 Dec 2011 11:40:51 +0530
>> > > Subject: [PATCH] I2C : tegra : devexit in remove
>> > >
>> > > Adding I2C __devexxit in remove
>> > >
>> > > Cc: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
>> > > Signed-off-by: Shubhrajyoti D <shubhrajyoti-l0cyMroinI0@public.gmane.org>
>> >
>> > Acked-by: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
>> >
>> > Ben or Olof,
>> >
>> > > -       .remove  = tegra_i2c_remove,
>> > > +       .remove  =__devexit_p(tegra_i2c_remove),
>> >
>> > When you apply this, can you fix it up to add a space after the = in
>> > the modified line? If you want, I can post an updated version to do that.
>>
>> Let me know if you want anything applying or a pull-request processed.
>>
>> I think once fixed the patches would be fine and I ack them:
>>
>> Acked-by: Ben Dooks <ben-linux-elnMNo+KYs3YtjvyW6yDsg@public.gmane.org>
>
> Olof, since you took the original through the Tegra tree, I think it
> makes sense for us to take this fix through there too, and for 3.3?
> The patch above is http://patchwork.ozlabs.org/patch/132349/

Yep, will do.


-Olof

RE: [PATCH V2 1/4] i2c: tegra: Add __devinit/exit to probe/remove

[Stephen Warren]

Olof Johansson wrote at Friday, January 06, 2012 10:45 AM:
> On Fri, Jan 6, 2012 at 8:47 AM, Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org> wrote:
> > Ben Dooks wrote at Friday, January 06, 2012 9:26 AM:
> >> On Tue, Dec 20, 2011 at 01:47:29PM -0800, Stephen Warren wrote:
> >> > Shubhrajyoti Datta wrote at Monday, December 19, 2011 11:15 PM:
> >> > ...
> >> > > Hi Stephen ,
> >> > > could you check this one also
> >> > > thanks.
> >> > >
> >> > > From: Shubhrajyoti D <shubhrajyoti-l0cyMroinI0@public.gmane.org>
> >> > > Date: Tue, 20 Dec 2011 11:40:51 +0530
> >> > > Subject: [PATCH] I2C : tegra : devexit in remove
> >> > >
> >> > > Adding I2C __devexxit in remove
> >> > >
> >> > > Cc: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
> >> > > Signed-off-by: Shubhrajyoti D <shubhrajyoti-l0cyMroinI0@public.gmane.org>
> >> >
> >> > Acked-by: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
> >> >
> >> > Ben or Olof,
> >> >
> >> > > -       .remove  = tegra_i2c_remove,
> >> > > +       .remove  =__devexit_p(tegra_i2c_remove),
> >> >
> >> > When you apply this, can you fix it up to add a space after the = in
> >> > the modified line? If you want, I can post an updated version to do that.
> >>
> >> Let me know if you want anything applying or a pull-request processed.
> >>
> >> I think once fixed the patches would be fine and I ack them:
> >>
> >> Acked-by: Ben Dooks <ben-linux-elnMNo+KYs3YtjvyW6yDsg@public.gmane.org>
> >
> > Olof, since you took the original through the Tegra tree, I think it
> > makes sense for us to take this fix through there too, and for 3.3?
> > The patch above is http://patchwork.ozlabs.org/patch/132349/
> 
> Yep, will do.

I haven't seen this show up anywhere yet.

-- 
nvpublic

Re: [PATCH V2 1/4] i2c: tegra: Add __devinit/exit to probe/removeG

[Olof Johansson]

On Fri, Jan 06, 2012 at 08:47:11AM -0800, Stephen Warren wrote:
> Ben Dooks wrote at Friday, January 06, 2012 9:26 AM:
> > On Tue, Dec 20, 2011 at 01:47:29PM -0800, Stephen Warren wrote:
> > > Shubhrajyoti Datta wrote at Monday, December 19, 2011 11:15 PM:
> > > ...
> > > > Hi Stephen ,
> > > > could you check this one also
> > > > thanks.
> > > >
> > > > From: Shubhrajyoti D <shubhrajyoti-l0cyMroinI0@public.gmane.org>
> > > > Date: Tue, 20 Dec 2011 11:40:51 +0530
> > > > Subject: [PATCH] I2C : tegra : devexit in remove
> > > >
> > > > Adding I2C __devexxit in remove
> > > >
> > > > Cc: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
> > > > Signed-off-by: Shubhrajyoti D <shubhrajyoti-l0cyMroinI0@public.gmane.org>
> > >
> > > Acked-by: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
> > >
> > > Ben or Olof,
> > >
> > > > -       .remove  = tegra_i2c_remove,
> > > > +       .remove  =__devexit_p(tegra_i2c_remove),
> > >
> > > When you apply this, can you fix it up to add a space after the = in
> > > the modified line? If you want, I can post an updated version to do that.
> > 
> > Let me know if you want anything applying or a pull-request processed.
> > 
> > I think once fixed the patches would be fine and I ack them:
> > 
> > Acked-by: Ben Dooks <ben-linux-elnMNo+KYs3YtjvyW6yDsg@public.gmane.org>
> 
> Olof, since you took the original through the Tegra tree, I think it
> makes sense for us to take this fix through there too, and for 3.3?
> The patch above is http://patchwork.ozlabs.org/patch/132349/

Done, applied, sorry for the delay.

The patch has whitespace damage but I fixed it up manually.


-Olof

Re: [PATCH V2 1/4] i2c: tegra: Add __devinit/exit to probe/remove

[Ben Dooks]

On Sat, Dec 17, 2011 at 11:29:29PM -0700, Stephen Warren wrote:
> This fixes some section mismatch build warnings.
> 
> Signed-off-by: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
> ---
> v2: New patch.
> 
>  drivers/i2c/busses/i2c-tegra.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c
> index 46b6500..e8560ed 100644
> --- a/drivers/i2c/busses/i2c-tegra.c
> +++ b/drivers/i2c/busses/i2c-tegra.c
> @@ -558,7 +558,7 @@ static const struct i2c_algorithm tegra_i2c_algo = {
>  	.functionality	= tegra_i2c_func,
>  };
>  
> -static int tegra_i2c_probe(struct platform_device *pdev)
> +static int __devinit tegra_i2c_probe(struct platform_device *pdev)
>  {
>  	struct tegra_i2c_dev *i2c_dev;
>  	struct tegra_i2c_platform_data *pdata = pdev->dev.platform_data;
> @@ -690,7 +690,7 @@ err_iounmap:
>  	return ret;
>  }
>  
> -static int tegra_i2c_remove(struct platform_device *pdev)
> +static int __devexit tegra_i2c_remove(struct platform_device *pdev)
>  {
>  	struct tegra_i2c_dev *i2c_dev = platform_get_drvdata(pdev);
>  	i2c_del_adapter(&i2c_dev->adapter);

You need t oupdate the platform driver's .remove method with __devexit_p
to ensure that it nulls it out.

-- 
Ben Dooks, ben-elnMNo+KYs3YtjvyW6yDsg@public.gmane.org, http://www.fluff.org/ben/

Large Hadron Colada: A large Pina Colada that makes the universe disappear.