[PATCH 1/2] atmel/spi: fix missing probe

[PATCH 1/2] atmel/spi: fix missing probe

[Jean-Christophe PLAGNIOL-VILLARD]

Commit 940ab889 "drivercore: Add helper macro for platform_driver boilerplate"
converted this driver to use module_platform_driver, but due to the use
of platform_driver_probe(), this resulted in the call to atmel_spi_probe being
lost. Place the call to this function into the driver structure.

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Cc: Greg Kroah-Hartman <gregkh@suse.de>
Cc: Grant Likely <grant.likely@secretlab.ca>
Cc: Russell King - ARM Linux <linux@arm.linux.org.uk>
---
v3:

	update commit message
 drivers/spi/spi-atmel.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/drivers/spi/spi-atmel.c b/drivers/spi/spi-atmel.c
index 79665e2..3cd4f49 100644
--- a/drivers/spi/spi-atmel.c
+++ b/drivers/spi/spi-atmel.c
@@ -1072,6 +1072,7 @@ static struct platform_driver atmel_spi_driver = {
 	},
 	.suspend	= atmel_spi_suspend,
 	.resume		= atmel_spi_resume,
+	.prove		= atmel_spi_probe,
 	.remove		= __exit_p(atmel_spi_remove),
 };
 module_platform_driver(atmel_spi_driver);
-- 
1.7.7

[PATCH 2/2] atmel/spi: fix section missmatch

[Jean-Christophe PLAGNIOL-VILLARD]

atmel_spi_probe is marked __init where it's supposed to be __devinit

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Cc: Russell King - ARM Linux <linux@arm.linux.org.uk>
---
 drivers/spi/spi-atmel.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/spi/spi-atmel.c b/drivers/spi/spi-atmel.c
index 3cd4f49..1525262 100644
--- a/drivers/spi/spi-atmel.c
+++ b/drivers/spi/spi-atmel.c
@@ -907,7 +907,7 @@ static void atmel_spi_cleanup(struct spi_device *spi)
 
 /*-------------------------------------------------------------------------*/
 
-static int __init atmel_spi_probe(struct platform_device *pdev)
+static int __devinit atmel_spi_probe(struct platform_device *pdev)
 {
 	struct resource		*regs;
 	int			irq;
-- 
1.7.7

Re: [PATCH 1/2] atmel/spi: fix missing probe

[Daniel Mack]

On 11/03/2011 06:41 PM, Jean-Christophe PLAGNIOL-VILLARD wrote:
> Commit 940ab889 "drivercore: Add helper macro for platform_driver boilerplate"
> converted this driver to use module_platform_driver, but due to the use
> of platform_driver_probe(), this resulted in the call to atmel_spi_probe being
> lost. Place the call to this function into the driver structure.
>
> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD<plagnioj-sclMFOaUSTBWk0Htik3J/w@public.gmane.org>
> Cc: Greg Kroah-Hartman<gregkh-l3A5Bk7waGM@public.gmane.org>
> Cc: Grant Likely<grant.likely-s3s/WqlpOiPyB63q8FvJNQ@public.gmane.org>
> Cc: Russell King - ARM Linux<linux-lFZ/pmaqli7XmaaqVzeoHQ@public.gmane.org>
> ---
> v3:
>
> 	update commit message
>   drivers/spi/spi-atmel.c |    1 +
>   1 files changed, 1 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/spi/spi-atmel.c b/drivers/spi/spi-atmel.c
> index 79665e2..3cd4f49 100644
> --- a/drivers/spi/spi-atmel.c
> +++ b/drivers/spi/spi-atmel.c
> @@ -1072,6 +1072,7 @@ static struct platform_driver atmel_spi_driver = {
>   	},
>   	.suspend	= atmel_spi_suspend,
>   	.resume		= atmel_spi_resume,
> +	.prove		= atmel_spi_probe,
          ^^^^^

This is certainly a typo. Didn't you even compile-test this?



Daniel

------------------------------------------------------------------------------
RSA(R) Conference 2012
Save $700 by Nov 18
Register now
http://p.sf.net/sfu/rsa-sfdev2dev1

Re: [PATCH 1/2] atmel/spi: fix missing probe

[Jean-Christophe PLAGNIOL-VILLARD]

On 18:50 Thu 03 Nov     , Daniel Mack wrote:
> On 11/03/2011 06:41 PM, Jean-Christophe PLAGNIOL-VILLARD wrote:
> >Commit 940ab889 "drivercore: Add helper macro for platform_driver boilerplate"
> >converted this driver to use module_platform_driver, but due to the use
> >of platform_driver_probe(), this resulted in the call to atmel_spi_probe being
> >lost. Place the call to this function into the driver structure.
> >
> >Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD<plagnioj@jcrosoft.com>
> >Cc: Greg Kroah-Hartman<gregkh@suse.de>
> >Cc: Grant Likely<grant.likely@secretlab.ca>
> >Cc: Russell King - ARM Linux<linux@arm.linux.org.uk>
> >---
> >v3:
> >
> >	update commit message
> >  drivers/spi/spi-atmel.c |    1 +
> >  1 files changed, 1 insertions(+), 0 deletions(-)
> >
> >diff --git a/drivers/spi/spi-atmel.c b/drivers/spi/spi-atmel.c
> >index 79665e2..3cd4f49 100644
> >--- a/drivers/spi/spi-atmel.c
> >+++ b/drivers/spi/spi-atmel.c
> >@@ -1072,6 +1072,7 @@ static struct platform_driver atmel_spi_driver = {
> >  	},
> >  	.suspend	= atmel_spi_suspend,
> >  	.resume		= atmel_spi_resume,
> >+	.prove		= atmel_spi_probe,
>          ^^^^^
> 
> This is certainly a typo. Didn't you even compile-test this?
I did I make the typo when editing the commit message before sending the
patch
Dame

Best Regards,
J.

[PATCH 1/2 v4] atmel/spi: fix missing probe

[Jean-Christophe PLAGNIOL-VILLARD]

Commit 940ab889 "drivercore: Add helper macro for platform_driver boilerplate"
converted this driver to use module_platform_driver, but due to the use
of platform_driver_probe(), this resulted in the call to atmel_spi_probe being
lost. Place the call to this function into the driver structure.

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Cc: Greg Kroah-Hartman <gregkh@suse.de>
Cc: Grant Likely <grant.likely@secretlab.ca>
Cc: Russell King - ARM Linux <linux@arm.linux.org.uk>
---
v4:

	fix typo when editing commit message
 drivers/spi/spi-atmel.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/drivers/spi/spi-atmel.c b/drivers/spi/spi-atmel.c
index 79665e2..3cd4f49 100644
--- a/drivers/spi/spi-atmel.c
+++ b/drivers/spi/spi-atmel.c
@@ -1072,6 +1072,7 @@ static struct platform_driver atmel_spi_driver = {
 	},
 	.suspend	= atmel_spi_suspend,
 	.resume		= atmel_spi_resume,
+	.probe		= atmel_spi_probe,
 	.remove		= __exit_p(atmel_spi_remove),
 };
 module_platform_driver(atmel_spi_driver);
-- 
1.7.7

Re: [PATCH 1/2 v4] atmel/spi: fix missing probe

[Russell King - ARM Linux]

On Fri, Nov 04, 2011 at 01:57:40AM +0800, Jean-Christophe PLAGNIOL-VILLARD wrote:
> Commit 940ab889 "drivercore: Add helper macro for platform_driver boilerplate"
> converted this driver to use module_platform_driver, but due to the use
> of platform_driver_probe(), this resulted in the call to atmel_spi_probe being
> lost. Place the call to this function into the driver structure.

Let me say again, this should not be the first patch in the series.
If you're trying to fix a bug don't introduce a new bug by fixing
another bug.

If you did this with, say, the VM or FS subsystem, you'll have this
patch reverted.

Moreover, it's bad practice to do "fixes" in this way, especially when
it's trivial to do it _right_ as I've already mentioned several times.

I still maintain that it should be _one_ patch fixing these issues, not
two.