[PATCH] 2.5 ips.c pci_module_init

[PATCH] 2.5 ips.c pci_module_init

[Mike Anderson]

This patch is against 2.5.58 but also applies to scsi-misc-2.5 with a
offset 1 line warning.

This error started near 2.5.56 with badness warnings when the driver
loaded and has progressed to the driver probe routine not being called
at all as sysfs error propagation patches have been added. Since my
ServeRAID card is old it is the last pci_module_init to be called.

The patch just changes the name field in the ips pci_driver struct as
the three pci_driver names where not unique and cause EEXIST errors.

I have cc'd David Jeffery the driver maintainer.

-andmike
--
Michael Anderson
andmike@us.ibm.com

 ips.c |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)
------

--- 1.38/drivers/scsi/ips.c	Fri Jan 10 11:40:07 2003
+++ edited/drivers/scsi/ips.c	Thu Jan 16 11:42:00 2003
@@ -271,27 +271,25 @@
 
    MODULE_DEVICE_TABLE( pci, ips_pci_table );
 
-   static char ips_hot_plug_name[] = "ips";
-   
    static int __devinit  ips_insert_device(struct pci_dev *pci_dev, const struct pci_device_id *ent);
    static void __devexit ips_remove_device(struct pci_dev *pci_dev);
    
    struct pci_driver ips_pci_driver = {
-       .name		= ips_hot_plug_name,
+       .name		= "ips",
        .id_table	= ips_pci_table,
        .probe		= ips_insert_device,
        .remove		= __devexit_p(ips_remove_device),
    }; 
            
    struct pci_driver ips_pci_driver_5i = {
-       .name		= ips_hot_plug_name,
+       .name		= "ips_5i",
        .id_table	= ips_pci_table_5i,
        .probe		= ips_insert_device,
        .remove		= __devexit_p(ips_remove_device),
    };
 
    struct pci_driver ips_pci_driver_i960 = {
-       .name		= ips_hot_plug_name,
+       .name		= "ips_i960",
        .id_table	= ips_pci_table_i960,
        .probe		= ips_insert_device,
        .remove		= __devexit_p(ips_remove_device),

RE: [PATCH] 2.5 ips.c pci_module_init

[Jeffery, David]

I have no problem with Mike's patch.  I'm working on a different fix
so that we don't have to have multiple tables.  I should be done testing
it and other changes some time next week.

Mike, I'm also integrating your patch for 2.5 64bit addressing support.
I should have done it sooner, but better late than never.

David Jeffery

> -----Original Message-----
> From: Mike Anderson [mailto:andmike@us.ibm.com]
> Sent: Thursday, January 16, 2003 6:10 PM
> To: linux-scsi@vger.kernel.org
> Cc: David_Jeffery@adaptec.com
> Subject: [PATCH] 2.5 ips.c pci_module_init
> 
> 
> This patch is against 2.5.58 but also applies to scsi-misc-2.5 with a
> offset 1 line warning.
> 
> This error started near 2.5.56 with badness warnings when the driver
> loaded and has progressed to the driver probe routine not being called
> at all as sysfs error propagation patches have been added. Since my
> ServeRAID card is old it is the last pci_module_init to be called.
> 
> The patch just changes the name field in the ips pci_driver struct as
> the three pci_driver names where not unique and cause EEXIST errors.
> 
> I have cc'd David Jeffery the driver maintainer.
> 
> -andmike
> --
> Michael Anderson
> andmike@us.ibm.com
> 
>  ips.c |    8 +++-----
>  1 files changed, 3 insertions(+), 5 deletions(-)
> ------