[2.4 patch] fix ips.c .text.exit error

• Next message: Adrian Bunk: "[patch] fix atm/iphase.c .text.exit error"
• Previous message: Adrian Bunk: "[patch] fix .text.exit error in drivers/net/r8169.c"
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

In 2.4.21-pre6 the __devinit function ips_insert_device in
drivers/scsi/ips.c calls the __devexit function ips_remove_device
resulting in a .text.exit compile error if !CONFIG_HOTPLUG.

The patch below removes the __devexit from ips_remove_device.

I've tested the compilation with 2.4.21-pre6.

Please apply
Adrian

--- linux-2.4.21-pre6-full-nohotplug/drivers/scsi/ips.c.old 2003-03-27 22:25:49.000000000 +0100
+++ linux-2.4.21-pre6-full-nohotplug/drivers/scsi/ips.c 2003-03-27 22:28:51.000000000 +0100
@@ -246,9 +246,6 @@
     #define IPS_SG_ADDRESS(sg) ((sg)->address)
     #define IPS_LOCK_SAVE(lock,flags) spin_lock_irqsave(&io_request_lock,flags)
     #define IPS_UNLOCK_RESTORE(lock,flags) spin_unlock_irqrestore(&io_request_lock,flags)
- #ifndef __devexit_p
- #define __devexit_p(x) x
- #endif
 #else
     #define IPS_SG_ADDRESS(sg) (page_address((sg)->page) ? \
                                      page_address((sg)->page)+(sg)->offset : 0)
@@ -338,48 +335,48 @@
    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);
+ static void ips_remove_device(struct pci_dev *pci_dev);
    
    struct pci_driver ips_pci_driver = {
        name: ips_hot_plug_name,
        id_table: ips_pci_table,
        probe: ips_insert_device,
- remove: __devexit_p(ips_remove_device),
+ remove: ips_remove_device,
    };
            
    struct pci_driver ips_pci_driver_anaconda = {
        name: ips_hot_plug_name,
        id_table: ips_pci_table_anaconda,
        probe: ips_insert_device,
- remove: __devexit_p(ips_remove_device),
+ remove: ips_remove_device,
    };
 
    struct pci_driver ips_pci_driver_5i = {
        name: ips_hot_plug_name,
        id_table: ips_pci_table_5i,
        probe: ips_insert_device,
- remove: __devexit_p(ips_remove_device),
+ remove: ips_remove_device,
    };
            
    struct pci_driver ips_pci_driver_6i = {
        name: ips_hot_plug_name,
        id_table: ips_pci_table_6i,
        probe: ips_insert_device,
- remove: __devexit_p(ips_remove_device),
+ remove: ips_remove_device,
    };
 
    struct pci_driver ips_pci_driver_i960 = {
        name: ips_hot_plug_name,
        id_table: ips_pci_table_i960,
        probe: ips_insert_device,
- remove: __devexit_p(ips_remove_device),
+ remove: ips_remove_device,
    };
 
    struct pci_driver ips_pci_driver_adaptec = {
        name: ips_hot_plug_name,
        id_table: ips_pci_table_adaptec,
        probe: ips_insert_device,
- remove: __devexit_p(ips_remove_device),
+ remove: ips_remove_device,
    };
 
 #endif
@@ -7346,7 +7343,7 @@
 /* Routine Description: */
 /* Remove one Adapter ( Hot Plugging ) */
 /*---------------------------------------------------------------------------*/
-static void __devexit ips_remove_device(struct pci_dev *pci_dev)
+static void ips_remove_device(struct pci_dev *pci_dev)
 {
    int i;
    struct Scsi_Host *sh;
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

• Next message: Adrian Bunk: "[patch] fix atm/iphase.c .text.exit error"
• Previous message: Adrian Bunk: "[patch] fix .text.exit error in drivers/net/r8169.c"
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

This archive was generated by hypermail 2b29 : Mon Mar 31 2003 - 22:00:29 EST