[patch 06/11] drivers/scsi/aacraid/*: convert to pci_register_driver

[patch 06/11] drivers/scsi/aacraid/*: convert to pci_register_driver

[domen]

convert from pci_module_init to pci_register_driver
(from:http://kerneljanitors.org/TODO).

Signed-off-by: Christophe Lucas <c.lucas@ifrance.com>
Signed-off-by: Domen Puncer <domen@coderock.org>
---


 kj-domen/drivers/scsi/aacraid/linit.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

diff -puN drivers/scsi/aacraid/linit.c~pci_register_driver-drivers_scsi_aacraid drivers/scsi/aacraid/linit.c
--- kj/drivers/scsi/aacraid/linit.c~pci_register_driver-drivers_scsi_aacraid	2005-03-05 16:12:51.000000000 +0100
+++ kj-domen/drivers/scsi/aacraid/linit.c	2005-03-05 16:12:51.000000000 +0100
@@ -690,7 +690,7 @@ static int __init aac_init(void)
 	printk(KERN_INFO "Red Hat/Adaptec aacraid driver (%s %s)\n",
 			AAC_DRIVER_VERSION, AAC_DRIVER_BUILD_DATE);
 
-	error = pci_module_init(&aac_pci_driver);
+	error = pci_register_driver(&aac_pci_driver);
 	if (error)
 		return error;
 
_

RE: [patch 06/11] drivers/scsi/aacraid/*: convert to pci_register_driver

[Salyzyn, Mark]

I have to reject this change since pci_module_init() has a different
return code than pci_register_driver().

The patch should look like:

-	error = pci_module_init(&aac_pci_driver);
+	error = pci_register_driver(&aac_pci_driver);
-	if (error)
+	if (error < 0)
 		return error;

Sincerely -- Mark Salyzyn

-----Original Message-----
From: linux-scsi-owner@vger.kernel.org
[mailto:linux-scsi-owner@vger.kernel.org] On Behalf Of
domen@coderock.org
Sent: Sunday, March 06, 2005 5:27 PM
To: James.Bottomley@SteelEye.com
Cc: linux-scsi@vger.kernel.org; domen@coderock.org; c.lucas@ifrance.com
Subject: [patch 06/11] drivers/scsi/aacraid/*: convert to
pci_register_driver


convert from pci_module_init to pci_register_driver
(from:http://kerneljanitors.org/TODO).

Signed-off-by: Christophe Lucas <c.lucas@ifrance.com>
Signed-off-by: Domen Puncer <domen@coderock.org>
---


 kj-domen/drivers/scsi/aacraid/linit.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

diff -puN
drivers/scsi/aacraid/linit.c~pci_register_driver-drivers_scsi_aacraid
drivers/scsi/aacraid/linit.c
---
kj/drivers/scsi/aacraid/linit.c~pci_register_driver-drivers_scsi_aacraid
2005-03-05 16:12:51.000000000 +0100
+++ kj-domen/drivers/scsi/aacraid/linit.c	2005-03-05
16:12:51.000000000 +0100
@@ -690,7 +690,7 @@ static int __init aac_init(void)
 	printk(KERN_INFO "Red Hat/Adaptec aacraid driver (%s %s)\n",
 			AAC_DRIVER_VERSION, AAC_DRIVER_BUILD_DATE);
 
-	error = pci_module_init(&aac_pci_driver);
+	error = pci_register_driver(&aac_pci_driver);
 	if (error)
 		return error;
 
_
-
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [patch 06/11] drivers/scsi/aacraid/*: convert to pci_register_driver

[Domen Puncer]

On 15/03/05 08:38 -0500, Salyzyn, Mark wrote:
> I have to reject this change since pci_module_init() has a different
> return code than pci_register_driver().

pci.h: #define pci_module_init pci_register_driver

pci-driver.c: pci_register_driver:
	"Returns a negative value on error, otherwise 0."

So... since it can't return positive number, these conditions are the same.


> 
> The patch should look like:
> 
> -	error = pci_module_init(&aac_pci_driver);
> +	error = pci_register_driver(&aac_pci_driver);
> -	if (error)
> +	if (error < 0)
>  		return error;
> 
> Sincerely -- Mark Salyzyn
> 
> -----Original Message-----
> From: linux-scsi-owner@vger.kernel.org
> [mailto:linux-scsi-owner@vger.kernel.org] On Behalf Of
> domen@coderock.org
> Sent: Sunday, March 06, 2005 5:27 PM
> To: James.Bottomley@SteelEye.com
> Cc: linux-scsi@vger.kernel.org; domen@coderock.org; c.lucas@ifrance.com
> Subject: [patch 06/11] drivers/scsi/aacraid/*: convert to
> pci_register_driver
> 
> 
> convert from pci_module_init to pci_register_driver
> (from:http://kerneljanitors.org/TODO).
> 
> Signed-off-by: Christophe Lucas <c.lucas@ifrance.com>
> Signed-off-by: Domen Puncer <domen@coderock.org>
> ---
> 
> 
>  kj-domen/drivers/scsi/aacraid/linit.c |    2 +-
>  1 files changed, 1 insertion(+), 1 deletion(-)
> 
> diff -puN
> drivers/scsi/aacraid/linit.c~pci_register_driver-drivers_scsi_aacraid
> drivers/scsi/aacraid/linit.c
> ---
> kj/drivers/scsi/aacraid/linit.c~pci_register_driver-drivers_scsi_aacraid
> 2005-03-05 16:12:51.000000000 +0100
> +++ kj-domen/drivers/scsi/aacraid/linit.c	2005-03-05
> 16:12:51.000000000 +0100
> @@ -690,7 +690,7 @@ static int __init aac_init(void)
>  	printk(KERN_INFO "Red Hat/Adaptec aacraid driver (%s %s)\n",
>  			AAC_DRIVER_VERSION, AAC_DRIVER_BUILD_DATE);
>  
> -	error = pci_module_init(&aac_pci_driver);
> +	error = pci_register_driver(&aac_pci_driver);
>  	if (error)
>  		return error;
>  
> _
> -
> To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

RE: [patch 06/11] drivers/scsi/aacraid/*: convert to pci_register_driver

[Salyzyn, Mark]

We have tested and seen a positive number being returned on late model
distributions (FC3)

Sincerely -- Mark Salyzyn

-----Original Message-----
From: Domen Puncer [mailto:domen@coderock.org] 
Sent: Tuesday, March 15, 2005 10:57 AM
To: Salyzyn, Mark
Cc: James.Bottomley@SteelEye.com; linux-scsi@vger.kernel.org;
c.lucas@ifrance.com
Subject: Re: [patch 06/11] drivers/scsi/aacraid/*: convert to
pci_register_driver

On 15/03/05 08:38 -0500, Salyzyn, Mark wrote:
> I have to reject this change since pci_module_init() has a different
> return code than pci_register_driver().

pci.h: #define pci_module_init pci_register_driver

pci-driver.c: pci_register_driver:
	"Returns a negative value on error, otherwise 0."

So... since it can't return positive number, these conditions are the
same.


> 
> The patch should look like:
> 
> -	error = pci_module_init(&aac_pci_driver);
> +	error = pci_register_driver(&aac_pci_driver);
> -	if (error)
> +	if (error < 0)
>  		return error;
> 
> Sincerely -- Mark Salyzyn
> 
> -----Original Message-----
> From: linux-scsi-owner@vger.kernel.org
> [mailto:linux-scsi-owner@vger.kernel.org] On Behalf Of
> domen@coderock.org
> Sent: Sunday, March 06, 2005 5:27 PM
> To: James.Bottomley@SteelEye.com
> Cc: linux-scsi@vger.kernel.org; domen@coderock.org;
c.lucas@ifrance.com
> Subject: [patch 06/11] drivers/scsi/aacraid/*: convert to
> pci_register_driver
> 
> 
> convert from pci_module_init to pci_register_driver
> (from:http://kerneljanitors.org/TODO).
> 
> Signed-off-by: Christophe Lucas <c.lucas@ifrance.com>
> Signed-off-by: Domen Puncer <domen@coderock.org>
> ---
> 
> 
>  kj-domen/drivers/scsi/aacraid/linit.c |    2 +-
>  1 files changed, 1 insertion(+), 1 deletion(-)
> 
> diff -puN
> drivers/scsi/aacraid/linit.c~pci_register_driver-drivers_scsi_aacraid
> drivers/scsi/aacraid/linit.c
> ---
>
kj/drivers/scsi/aacraid/linit.c~pci_register_driver-drivers_scsi_aacraid
> 2005-03-05 16:12:51.000000000 +0100
> +++ kj-domen/drivers/scsi/aacraid/linit.c	2005-03-05
> 16:12:51.000000000 +0100
> @@ -690,7 +690,7 @@ static int __init aac_init(void)
>  	printk(KERN_INFO "Red Hat/Adaptec aacraid driver (%s %s)\n",
>  			AAC_DRIVER_VERSION, AAC_DRIVER_BUILD_DATE);
>  
> -	error = pci_module_init(&aac_pci_driver);
> +	error = pci_register_driver(&aac_pci_driver);
>  	if (error)
>  		return error;
>  
> _
> -
> To unsubscribe from this list: send the line "unsubscribe linux-scsi"
in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [patch 06/11] drivers/scsi/aacraid/*: convert to pci_register_driver

[Domen Puncer]

On 15/03/05 10:59 -0500, Salyzyn, Mark wrote:
> We have tested and seen a positive number being returned on late model
> distributions (FC3)

Function tree from 2.6.11-bk9:

pci_register_driver
  driver_register
    bus_add_driver
      kobject_set_name - ok
      kobject_register
	kobject_add
	  create_dir
	    sysfs_create_dir
	      create_dir (different from above)
	        sysfs_create
		  init (init_dir from sysfs/dir.c) - ok
		sysfs_make_dirent - ok
	    populate_dir
	      sysfs_create_file
	        sysfs_add_file
		  sysfs_make_dirent - ok


Seems ok to me. Am I missing something?
How about a "if (error > 0) dump_stack()" to find the offender?

> 
> Sincerely -- Mark Salyzyn
> 
> -----Original Message-----
> From: Domen Puncer [mailto:domen@coderock.org] 
> Sent: Tuesday, March 15, 2005 10:57 AM
> To: Salyzyn, Mark
> Cc: James.Bottomley@SteelEye.com; linux-scsi@vger.kernel.org;
> c.lucas@ifrance.com
> Subject: Re: [patch 06/11] drivers/scsi/aacraid/*: convert to
> pci_register_driver
> 
> On 15/03/05 08:38 -0500, Salyzyn, Mark wrote:
> > I have to reject this change since pci_module_init() has a different
> > return code than pci_register_driver().
> 
> pci.h: #define pci_module_init pci_register_driver
> 
> pci-driver.c: pci_register_driver:
> 	"Returns a negative value on error, otherwise 0."
> 
> So... since it can't return positive number, these conditions are the
> same.
> 
> 
> > 
> > The patch should look like:
> > 
> > -	error = pci_module_init(&aac_pci_driver);
> > +	error = pci_register_driver(&aac_pci_driver);
> > -	if (error)
> > +	if (error < 0)
> >  		return error;
> > 
> > Sincerely -- Mark Salyzyn
> > 
> > -----Original Message-----
> > From: linux-scsi-owner@vger.kernel.org
> > [mailto:linux-scsi-owner@vger.kernel.org] On Behalf Of
> > domen@coderock.org
> > Sent: Sunday, March 06, 2005 5:27 PM
> > To: James.Bottomley@SteelEye.com
> > Cc: linux-scsi@vger.kernel.org; domen@coderock.org;
> c.lucas@ifrance.com
> > Subject: [patch 06/11] drivers/scsi/aacraid/*: convert to
> > pci_register_driver
> > 
> > 
> > convert from pci_module_init to pci_register_driver
> > (from:http://kerneljanitors.org/TODO).
> > 
> > Signed-off-by: Christophe Lucas <c.lucas@ifrance.com>
> > Signed-off-by: Domen Puncer <domen@coderock.org>
> > ---
> > 
> > 
> >  kj-domen/drivers/scsi/aacraid/linit.c |    2 +-
> >  1 files changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff -puN
> > drivers/scsi/aacraid/linit.c~pci_register_driver-drivers_scsi_aacraid
> > drivers/scsi/aacraid/linit.c
> > ---
> >
> kj/drivers/scsi/aacraid/linit.c~pci_register_driver-drivers_scsi_aacraid
> > 2005-03-05 16:12:51.000000000 +0100
> > +++ kj-domen/drivers/scsi/aacraid/linit.c	2005-03-05
> > 16:12:51.000000000 +0100
> > @@ -690,7 +690,7 @@ static int __init aac_init(void)
> >  	printk(KERN_INFO "Red Hat/Adaptec aacraid driver (%s %s)\n",
> >  			AAC_DRIVER_VERSION, AAC_DRIVER_BUILD_DATE);
> >  
> > -	error = pci_module_init(&aac_pci_driver);
> > +	error = pci_register_driver(&aac_pci_driver);
> >  	if (error)
> >  		return error;
> >  
> > _
> > -
> > To unsubscribe from this list: send the line "unsubscribe linux-scsi"
> in
> > the body of a message to majordomo@vger.kernel.org
> > More majordomo info at  http://vger.kernel.org/majordomo-info.html

RE: [patch 06/11] drivers/scsi/aacraid/*: convert to pci_register_driver

[Salyzyn, Mark]

FC3 != kernel.org, and the problem may not exist in latest tree. The
code for pci_module_init used to do a return (ret < 0) ? ret : 0.

The problem is then a 'transition' issue, as patches that appear here
can and will be used for kernel revisions a few back. By changing the
aacraid driver to check for < 0 rather than != 0 we improve reliability.
I have discovered that by doing so, the driver in the Adaptec Branch
taking this patch works fine all the way back early 2.4 trees.

Sincerely -- Mark Salyzyn

-----Original Message-----
From: Domen Puncer [mailto:domen@coderock.org] 
Sent: Tuesday, March 15, 2005 12:45 PM
To: Salyzyn, Mark
Cc: James.Bottomley@SteelEye.com; linux-scsi@vger.kernel.org;
c.lucas@ifrance.com
Subject: Re: [patch 06/11] drivers/scsi/aacraid/*: convert to
pci_register_driver

On 15/03/05 10:59 -0500, Salyzyn, Mark wrote:
> We have tested and seen a positive number being returned on late model
> distributions (FC3)

Function tree from 2.6.11-bk9:

pci_register_driver
  driver_register
    bus_add_driver
      kobject_set_name - ok
      kobject_register
	kobject_add
	  create_dir
	    sysfs_create_dir
	      create_dir (different from above)
	        sysfs_create
		  init (init_dir from sysfs/dir.c) - ok
		sysfs_make_dirent - ok
	    populate_dir
	      sysfs_create_file
	        sysfs_add_file
		  sysfs_make_dirent - ok


Seems ok to me. Am I missing something?
How about a "if (error > 0) dump_stack()" to find the offender?

> 
> Sincerely -- Mark Salyzyn
> 
> -----Original Message-----
> From: Domen Puncer [mailto:domen@coderock.org] 
> Sent: Tuesday, March 15, 2005 10:57 AM
> To: Salyzyn, Mark
> Cc: James.Bottomley@SteelEye.com; linux-scsi@vger.kernel.org;
> c.lucas@ifrance.com
> Subject: Re: [patch 06/11] drivers/scsi/aacraid/*: convert to
> pci_register_driver
> 
> On 15/03/05 08:38 -0500, Salyzyn, Mark wrote:
> > I have to reject this change since pci_module_init() has a different
> > return code than pci_register_driver().
> 
> pci.h: #define pci_module_init pci_register_driver
> 
> pci-driver.c: pci_register_driver:
> 	"Returns a negative value on error, otherwise 0."
> 
> So... since it can't return positive number, these conditions are the
> same.
> 
> 
> > 
> > The patch should look like:
> > 
> > -	error = pci_module_init(&aac_pci_driver);
> > +	error = pci_register_driver(&aac_pci_driver);
> > -	if (error)
> > +	if (error < 0)
> >  		return error;
> > 
> > Sincerely -- Mark Salyzyn
> > 
> > -----Original Message-----
> > From: linux-scsi-owner@vger.kernel.org
> > [mailto:linux-scsi-owner@vger.kernel.org] On Behalf Of
> > domen@coderock.org
> > Sent: Sunday, March 06, 2005 5:27 PM
> > To: James.Bottomley@SteelEye.com
> > Cc: linux-scsi@vger.kernel.org; domen@coderock.org;
> c.lucas@ifrance.com
> > Subject: [patch 06/11] drivers/scsi/aacraid/*: convert to
> > pci_register_driver
> > 
> > 
> > convert from pci_module_init to pci_register_driver
> > (from:http://kerneljanitors.org/TODO).
> > 
> > Signed-off-by: Christophe Lucas <c.lucas@ifrance.com>
> > Signed-off-by: Domen Puncer <domen@coderock.org>
> > ---
> > 
> > 
> >  kj-domen/drivers/scsi/aacraid/linit.c |    2 +-
> >  1 files changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff -puN
> >
drivers/scsi/aacraid/linit.c~pci_register_driver-drivers_scsi_aacraid
> > drivers/scsi/aacraid/linit.c
> > ---
> >
>
kj/drivers/scsi/aacraid/linit.c~pci_register_driver-drivers_scsi_aacraid
> > 2005-03-05 16:12:51.000000000 +0100
> > +++ kj-domen/drivers/scsi/aacraid/linit.c	2005-03-05
> > 16:12:51.000000000 +0100
> > @@ -690,7 +690,7 @@ static int __init aac_init(void)
> >  	printk(KERN_INFO "Red Hat/Adaptec aacraid driver (%s %s)\n",
> >  			AAC_DRIVER_VERSION, AAC_DRIVER_BUILD_DATE);
> >  
> > -	error = pci_module_init(&aac_pci_driver);
> > +	error = pci_register_driver(&aac_pci_driver);
> >  	if (error)
> >  		return error;
> >  
> > _
> > -
> > To unsubscribe from this list: send the line "unsubscribe
linux-scsi"
> in
> > the body of a message to majordomo@vger.kernel.org
> > More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [patch 06/11] drivers/scsi/aacraid/*: convert to pci_register_driver

[Domen Puncer]

On 15/03/05 12:59 -0500, Salyzyn, Mark wrote:
> FC3 != kernel.org, and the problem may not exist in latest tree. The
> code for pci_module_init used to do a return (ret < 0) ? ret : 0.
> 
> The problem is then a 'transition' issue, as patches that appear here
> can and will be used for kernel revisions a few back. By changing the
> aacraid driver to check for < 0 rather than != 0 we improve reliability.
> I have discovered that by doing so, the driver in the Adaptec Branch
> taking this patch works fine all the way back early 2.4 trees.
> 

Thanks for clearing that up.
Forgot that scsi is 2.4 compatible. And I have a note to drop
pci_register_driver patches for it. Sorry for all the noise.

So, here's a new patch, if someone wants it; i won't be resending :-)


Use pci_register_driver instead of pci_module_init (old API).

Signed-off-by: Domen Puncer <domen@coderock.org>

--- ./drivers/scsi/aacraid/linit.c.orig	2005-03-15 21:05:53.000000000 +0100
+++ ./drivers/scsi/aacraid/linit.c	2005-03-15 21:06:59.000000000 +0100
@@ -686,12 +686,12 @@ static struct pci_driver aac_pci_driver 
 static int __init aac_init(void)
 {
 	int error;
-	
+
 	printk(KERN_INFO "Red Hat/Adaptec aacraid driver (%s %s)\n",
 			AAC_DRIVER_VERSION, AAC_DRIVER_BUILD_DATE);
 
-	error = pci_module_init(&aac_pci_driver);
-	if (error)
+	error = pci_register_driver(&aac_pci_driver);
+	if (error < 0)
 		return error;
 
 	aac_cfg_major = register_chrdev( 0, "aac", &aac_cfg_fops);