Patched in Tegra support.

1 files changed, 78 insertions, 75 deletions

diff --git a/drivers/scsi/advansys.c b/drivers/scsi/advansys.c
index dcfaee66a8b..bfd618a6949 100644
--- a/drivers/scsi/advansys.c
+++ b/drivers/scsi/advansys.c
@@ -41,6 +41,7 @@
 #include <linux/firmware.h>
 
 #include <asm/io.h>
+#include <asm/system.h>
 #include <asm/dma.h>
 
 #include <scsi/scsi_cmnd.h>
@@ -9526,7 +9527,7 @@ advansys_queuecommand_lck(struct scsi_cmnd *scp, void (*done)(struct scsi_cmnd *
 
 static DEF_SCSI_QCMD(advansys_queuecommand)
 
-static ushort AscGetEisaChipCfg(PortAddr iop_base)
+static ushort __devinit AscGetEisaChipCfg(PortAddr iop_base)
 {
         PortAddr eisa_cfg_iop = (PortAddr) ASC_GET_EISA_SLOT(iop_base) |
             (PortAddr) (ASC_EISA_CFG_IOP_MASK);
@@ -9537,8 +9538,8 @@ static ushort AscGetEisaChipCfg(PortAddr iop_base)
  * Return the BIOS address of the adapter at the specified
  * I/O port and with the specified bus type.
  */
-static unsigned short AscGetChipBiosAddress(PortAddr iop_base,
-                                            unsigned short bus_type)
+static unsigned short __devinit
+AscGetChipBiosAddress(PortAddr iop_base, unsigned short bus_type)
 {
         unsigned short cfg_lsw;
         unsigned short bios_addr;
@@ -9569,7 +9570,7 @@ static unsigned short AscGetChipBiosAddress(PortAddr iop_base,
         return bios_addr;
 }
 
-static uchar AscSetChipScsiID(PortAddr iop_base, uchar new_host_id)
+static uchar __devinit AscSetChipScsiID(PortAddr iop_base, uchar new_host_id)
 {
         ushort cfg_lsw;
 
@@ -9583,7 +9584,7 @@ static uchar AscSetChipScsiID(PortAddr iop_base, uchar new_host_id)
         return (AscGetChipScsiID(iop_base));
 }
 
-static unsigned char AscGetChipScsiCtrl(PortAddr iop_base)
+static unsigned char __devinit AscGetChipScsiCtrl(PortAddr iop_base)
 {
         unsigned char sc;
 
@@ -9593,8 +9594,8 @@ static unsigned char AscGetChipScsiCtrl(PortAddr iop_base)
         return sc;
 }
 
-static unsigned char AscGetChipVersion(PortAddr iop_base,
-                                       unsigned short bus_type)
+static unsigned char __devinit
+AscGetChipVersion(PortAddr iop_base, unsigned short bus_type)
 {
         if (bus_type & ASC_IS_EISA) {
                 PortAddr eisa_iop;
@@ -9608,7 +9609,7 @@ static unsigned char AscGetChipVersion(PortAddr iop_base,
 }
 
 #ifdef CONFIG_ISA
-static void AscEnableIsaDma(uchar dma_channel)
+static void __devinit AscEnableIsaDma(uchar dma_channel)
 {
         if (dma_channel < 4) {
                 outp(0x000B, (ushort)(0xC0 | dma_channel));
@@ -9638,7 +9639,7 @@ static int AscStopQueueExe(PortAddr iop_base)
         return (0);
 }
 
-static ASC_DCNT AscGetMaxDmaCount(ushort bus_type)
+static ASC_DCNT __devinit AscGetMaxDmaCount(ushort bus_type)
 {
         if (bus_type & ASC_IS_ISA)
                 return ASC_MAX_ISA_DMA_COUNT;
@@ -9648,7 +9649,7 @@ static ASC_DCNT AscGetMaxDmaCount(ushort bus_type)
 }
 
 #ifdef CONFIG_ISA
-static ushort AscGetIsaDmaChannel(PortAddr iop_base)
+static ushort __devinit AscGetIsaDmaChannel(PortAddr iop_base)
 {
         ushort channel;
 
@@ -9660,7 +9661,7 @@ static ushort AscGetIsaDmaChannel(PortAddr iop_base)
         return (channel + 4);
 }
 
-static ushort AscSetIsaDmaChannel(PortAddr iop_base, ushort dma_channel)
+static ushort __devinit AscSetIsaDmaChannel(PortAddr iop_base, ushort dma_channel)
 {
         ushort cfg_lsw;
         uchar value;
@@ -9678,7 +9679,7 @@ static ushort AscSetIsaDmaChannel(PortAddr iop_base, ushort dma_channel)
         return 0;
 }
 
-static uchar AscGetIsaDmaSpeed(PortAddr iop_base)
+static uchar __devinit AscGetIsaDmaSpeed(PortAddr iop_base)
 {
         uchar speed_value;
 
@@ -9689,7 +9690,7 @@ static uchar AscGetIsaDmaSpeed(PortAddr iop_base)
         return speed_value;
 }
 
-static uchar AscSetIsaDmaSpeed(PortAddr iop_base, uchar speed_value)
+static uchar __devinit AscSetIsaDmaSpeed(PortAddr iop_base, uchar speed_value)
 {
         speed_value &= 0x07;
         AscSetBank(iop_base, 1);
@@ -9699,7 +9700,7 @@ static uchar AscSetIsaDmaSpeed(PortAddr iop_base, uchar speed_value)
 }
 #endif /* CONFIG_ISA */
 
-static ushort AscInitAscDvcVar(ASC_DVC_VAR *asc_dvc)
+static ushort __devinit AscInitAscDvcVar(ASC_DVC_VAR *asc_dvc)
 {
         int i;
         PortAddr iop_base;
@@ -9786,7 +9787,7 @@ static ushort AscInitAscDvcVar(ASC_DVC_VAR *asc_dvc)
         return warn_code;
 }
 
-static int AscWriteEEPCmdReg(PortAddr iop_base, uchar cmd_reg)
+static int __devinit AscWriteEEPCmdReg(PortAddr iop_base, uchar cmd_reg)
 {
         int retry;
 
@@ -9801,12 +9802,12 @@ static int AscWriteEEPCmdReg(PortAddr iop_base, uchar cmd_reg)
         return 0;
 }
 
-static void AscWaitEEPRead(void)
+static void __devinit AscWaitEEPRead(void)
 {
         mdelay(1);
 }
 
-static ushort AscReadEEPWord(PortAddr iop_base, uchar addr)
+static ushort __devinit AscReadEEPWord(PortAddr iop_base, uchar addr)
 {
         ushort read_wval;
         uchar cmd_reg;
@@ -9821,8 +9822,8 @@ static ushort AscReadEEPWord(PortAddr iop_base, uchar addr)
         return read_wval;
 }
 
-static ushort AscGetEEPConfig(PortAddr iop_base, ASCEEP_CONFIG *cfg_buf,
-                              ushort bus_type)
+static ushort __devinit
+AscGetEEPConfig(PortAddr iop_base, ASCEEP_CONFIG *cfg_buf, ushort bus_type)
 {
         ushort wval;
         ushort sum;
@@ -9868,7 +9869,7 @@ static ushort AscGetEEPConfig(PortAddr iop_base, ASCEEP_CONFIG *cfg_buf,
         return sum;
 }
 
-static int AscTestExternalLram(ASC_DVC_VAR *asc_dvc)
+static int __devinit AscTestExternalLram(ASC_DVC_VAR *asc_dvc)
 {
         PortAddr iop_base;
         ushort q_addr;
@@ -9890,12 +9891,12 @@ static int AscTestExternalLram(ASC_DVC_VAR *asc_dvc)
         return (sta);
 }
 
-static void AscWaitEEPWrite(void)
+static void __devinit AscWaitEEPWrite(void)
 {
         mdelay(20);
 }
 
-static int AscWriteEEPDataReg(PortAddr iop_base, ushort data_reg)
+static int __devinit AscWriteEEPDataReg(PortAddr iop_base, ushort data_reg)
 {
         ushort read_back;
         int retry;
@@ -9914,7 +9915,8 @@ static int AscWriteEEPDataReg(PortAddr iop_base, ushort data_reg)
         }
 }
 
-static ushort AscWriteEEPWord(PortAddr iop_base, uchar addr, ushort word_val)
+static ushort __devinit
+AscWriteEEPWord(PortAddr iop_base, uchar addr, ushort word_val)
 {
         ushort read_wval;
 
@@ -9934,8 +9936,8 @@ static ushort AscWriteEEPWord(PortAddr iop_base, uchar addr, ushort word_val)
         return (read_wval);
 }
 
-static int AscSetEEPConfigOnce(PortAddr iop_base, ASCEEP_CONFIG *cfg_buf,
-                               ushort bus_type)
+static int __devinit
+AscSetEEPConfigOnce(PortAddr iop_base, ASCEEP_CONFIG *cfg_buf, ushort bus_type)
 {
         int n_error;
         ushort *wbuf;
@@ -10030,8 +10032,8 @@ static int AscSetEEPConfigOnce(PortAddr iop_base, ASCEEP_CONFIG *cfg_buf,
         return n_error;
 }
 
-static int AscSetEEPConfig(PortAddr iop_base, ASCEEP_CONFIG *cfg_buf,
-                           ushort bus_type)
+static int __devinit
+AscSetEEPConfig(PortAddr iop_base, ASCEEP_CONFIG *cfg_buf, ushort bus_type)
 {
         int retry;
         int n_error;
@@ -10049,7 +10051,7 @@ static int AscSetEEPConfig(PortAddr iop_base, ASCEEP_CONFIG *cfg_buf,
         return n_error;
 }
 
-static ushort AscInitFromEEP(ASC_DVC_VAR *asc_dvc)
+static ushort __devinit AscInitFromEEP(ASC_DVC_VAR *asc_dvc)
 {
         ASCEEP_CONFIG eep_config_buf;
         ASCEEP_CONFIG *eep_config;
@@ -10214,7 +10216,7 @@ static ushort AscInitFromEEP(ASC_DVC_VAR *asc_dvc)
         return (warn_code);
 }
 
-static int AscInitGetConfig(struct Scsi_Host *shost)
+static int __devinit AscInitGetConfig(struct Scsi_Host *shost)
 {
         struct asc_board *board = shost_priv(shost);
         ASC_DVC_VAR *asc_dvc = &board->dvc_var.asc_dvc_var;
@@ -10268,7 +10270,7 @@ static int AscInitGetConfig(struct Scsi_Host *shost)
         return asc_dvc->err_code;
 }
 
-static int AscInitSetConfig(struct pci_dev *pdev, struct Scsi_Host *shost)
+static int __devinit AscInitSetConfig(struct pci_dev *pdev, struct Scsi_Host *shost)
 {
         struct asc_board *board = shost_priv(shost);
         ASC_DVC_VAR *asc_dvc = &board->dvc_var.asc_dvc_var;
@@ -10382,7 +10384,7 @@ static int AscInitSetConfig(struct pci_dev *pdev, struct Scsi_Host *shost)
  * on big-endian platforms so char fields read as words are actually being
  * unswapped on big-endian platforms.
  */
-static ADVEEP_3550_CONFIG Default_3550_EEPROM_Config = {
+static ADVEEP_3550_CONFIG Default_3550_EEPROM_Config __devinitdata = {
         ADV_EEPROM_BIOS_ENABLE, /* cfg_lsw */
         0x0000,                 /* cfg_msw */
         0xFFFF,                 /* disc_enable */
@@ -10420,7 +10422,7 @@ static ADVEEP_3550_CONFIG Default_3550_EEPROM_Config = {
         0                       /* num_of_err */
 };
 
-static ADVEEP_3550_CONFIG ADVEEP_3550_Config_Field_IsChar = {
+static ADVEEP_3550_CONFIG ADVEEP_3550_Config_Field_IsChar __devinitdata = {
         0,                      /* cfg_lsw */
         0,                      /* cfg_msw */
         0,                      /* -disc_enable */
@@ -10458,7 +10460,7 @@ static ADVEEP_3550_CONFIG ADVEEP_3550_Config_Field_IsChar = {
         0                       /* num_of_err */
 };
 
-static ADVEEP_38C0800_CONFIG Default_38C0800_EEPROM_Config = {
+static ADVEEP_38C0800_CONFIG Default_38C0800_EEPROM_Config __devinitdata = {
         ADV_EEPROM_BIOS_ENABLE, /* 00 cfg_lsw */
         0x0000,                 /* 01 cfg_msw */
         0xFFFF,                 /* 02 disc_enable */
@@ -10523,7 +10525,7 @@ static ADVEEP_38C0800_CONFIG Default_38C0800_EEPROM_Config = {
         0                       /* 63 reserved */
 };
 
-static ADVEEP_38C0800_CONFIG ADVEEP_38C0800_Config_Field_IsChar = {
+static ADVEEP_38C0800_CONFIG ADVEEP_38C0800_Config_Field_IsChar __devinitdata = {
         0,                      /* 00 cfg_lsw */
         0,                      /* 01 cfg_msw */
         0,                      /* 02 disc_enable */
@@ -10588,7 +10590,7 @@ static ADVEEP_38C0800_CONFIG ADVEEP_38C0800_Config_Field_IsChar = {
         0                       /* 63 reserved */
 };
 
-static ADVEEP_38C1600_CONFIG Default_38C1600_EEPROM_Config = {
+static ADVEEP_38C1600_CONFIG Default_38C1600_EEPROM_Config __devinitdata = {
         ADV_EEPROM_BIOS_ENABLE, /* 00 cfg_lsw */
         0x0000,                 /* 01 cfg_msw */
         0xFFFF,                 /* 02 disc_enable */
@@ -10653,7 +10655,7 @@ static ADVEEP_38C1600_CONFIG Default_38C1600_EEPROM_Config = {
         0                       /* 63 reserved */
 };
 
-static ADVEEP_38C1600_CONFIG ADVEEP_38C1600_Config_Field_IsChar = {
+static ADVEEP_38C1600_CONFIG ADVEEP_38C1600_Config_Field_IsChar __devinitdata = {
         0,                      /* 00 cfg_lsw */
         0,                      /* 01 cfg_msw */
         0,                      /* 02 disc_enable */
@@ -10722,7 +10724,7 @@ static ADVEEP_38C1600_CONFIG ADVEEP_38C1600_Config_Field_IsChar = {
 /*
  * Wait for EEPROM command to complete
  */
-static void AdvWaitEEPCmd(AdvPortAddr iop_base)
+static void __devinit AdvWaitEEPCmd(AdvPortAddr iop_base)
 {
         int eep_delay_ms;
 
@@ -10741,7 +10743,7 @@ static void AdvWaitEEPCmd(AdvPortAddr iop_base)
 /*
  * Read the EEPROM from specified location
  */
-static ushort AdvReadEEPWord(AdvPortAddr iop_base, int eep_word_addr)
+static ushort __devinit AdvReadEEPWord(AdvPortAddr iop_base, int eep_word_addr)
 {
         AdvWriteWordRegister(iop_base, IOPW_EE_CMD,
                              ASC_EEP_CMD_READ | eep_word_addr);
@@ -10752,8 +10754,8 @@ static ushort AdvReadEEPWord(AdvPortAddr iop_base, int eep_word_addr)
 /*
  * Write the EEPROM from 'cfg_buf'.
  */
-static void AdvSet3550EEPConfig(AdvPortAddr iop_base,
-                                ADVEEP_3550_CONFIG *cfg_buf)
+static void __devinit
+AdvSet3550EEPConfig(AdvPortAddr iop_base, ADVEEP_3550_CONFIG *cfg_buf)
 {
         ushort *wbuf;
         ushort addr, chksum;
@@ -10819,8 +10821,8 @@ static void AdvSet3550EEPConfig(AdvPortAddr iop_base,
 /*
  * Write the EEPROM from 'cfg_buf'.
  */
-static void AdvSet38C0800EEPConfig(AdvPortAddr iop_base,
-                                   ADVEEP_38C0800_CONFIG *cfg_buf)
+static void __devinit
+AdvSet38C0800EEPConfig(AdvPortAddr iop_base, ADVEEP_38C0800_CONFIG *cfg_buf)
 {
         ushort *wbuf;
         ushort *charfields;
@@ -10886,8 +10888,8 @@ static void AdvSet38C0800EEPConfig(AdvPortAddr iop_base,
 /*
  * Write the EEPROM from 'cfg_buf'.
  */
-static void AdvSet38C1600EEPConfig(AdvPortAddr iop_base,
-                                   ADVEEP_38C1600_CONFIG *cfg_buf)
+static void __devinit
+AdvSet38C1600EEPConfig(AdvPortAddr iop_base, ADVEEP_38C1600_CONFIG *cfg_buf)
 {
         ushort *wbuf;
         ushort *charfields;
@@ -10955,8 +10957,8 @@ static void AdvSet38C1600EEPConfig(AdvPortAddr iop_base,
  *
  * Return a checksum based on the EEPROM configuration read.
  */
-static ushort AdvGet3550EEPConfig(AdvPortAddr iop_base,
-                                  ADVEEP_3550_CONFIG *cfg_buf)
+static ushort __devinit
+AdvGet3550EEPConfig(AdvPortAddr iop_base, ADVEEP_3550_CONFIG *cfg_buf)
 {
         ushort wval, chksum;
         ushort *wbuf;
@@ -10998,8 +11000,8 @@ static ushort AdvGet3550EEPConfig(AdvPortAddr iop_base,
  *
  * Return a checksum based on the EEPROM configuration read.
  */
-static ushort AdvGet38C0800EEPConfig(AdvPortAddr iop_base,
-                                     ADVEEP_38C0800_CONFIG *cfg_buf)
+static ushort __devinit
+AdvGet38C0800EEPConfig(AdvPortAddr iop_base, ADVEEP_38C0800_CONFIG *cfg_buf)
 {
         ushort wval, chksum;
         ushort *wbuf;
@@ -11041,8 +11043,8 @@ static ushort AdvGet38C0800EEPConfig(AdvPortAddr iop_base,
  *
  * Return a checksum based on the EEPROM configuration read.
  */
-static ushort AdvGet38C1600EEPConfig(AdvPortAddr iop_base,
-                                     ADVEEP_38C1600_CONFIG *cfg_buf)
+static ushort __devinit
+AdvGet38C1600EEPConfig(AdvPortAddr iop_base, ADVEEP_38C1600_CONFIG *cfg_buf)
 {
         ushort wval, chksum;
         ushort *wbuf;
@@ -11091,7 +11093,7 @@ static ushort AdvGet38C1600EEPConfig(AdvPortAddr iop_base,
  *
  * Note: Chip is stopped on entry.
  */
-static int AdvInitFrom3550EEP(ADV_DVC_VAR *asc_dvc)
+static int __devinit AdvInitFrom3550EEP(ADV_DVC_VAR *asc_dvc)
 {
         AdvPortAddr iop_base;
         ushort warn_code;
@@ -11241,7 +11243,7 @@ static int AdvInitFrom3550EEP(ADV_DVC_VAR *asc_dvc)
  *
  * Note: Chip is stopped on entry.
  */
-static int AdvInitFrom38C0800EEP(ADV_DVC_VAR *asc_dvc)
+static int __devinit AdvInitFrom38C0800EEP(ADV_DVC_VAR *asc_dvc)
 {
         AdvPortAddr iop_base;
         ushort warn_code;
@@ -11440,7 +11442,7 @@ static int AdvInitFrom38C0800EEP(ADV_DVC_VAR *asc_dvc)
  *
  * Note: Chip is stopped on entry.
  */
-static int AdvInitFrom38C1600EEP(ADV_DVC_VAR *asc_dvc)
+static int __devinit AdvInitFrom38C1600EEP(ADV_DVC_VAR *asc_dvc)
 {
         AdvPortAddr iop_base;
         ushort warn_code;
@@ -11660,7 +11662,8 @@ static int AdvInitFrom38C1600EEP(ADV_DVC_VAR *asc_dvc)
  * For a non-fatal error return a warning code. If there are no warnings
  * then 0 is returned.
  */
-static int AdvInitGetConfig(struct pci_dev *pdev, struct Scsi_Host *shost)
+static int __devinit
+AdvInitGetConfig(struct pci_dev *pdev, struct Scsi_Host *shost)
 {
         struct asc_board *board = shost_priv(shost);
         ADV_DVC_VAR *asc_dvc = &board->dvc_var.adv_dvc_var;
@@ -11767,7 +11770,7 @@ static struct scsi_host_template advansys_template = {
         .use_clustering = ENABLE_CLUSTERING,
 };
 
-static int advansys_wide_init_chip(struct Scsi_Host *shost)
+static int __devinit advansys_wide_init_chip(struct Scsi_Host *shost)
 {
         struct asc_board *board = shost_priv(shost);
         struct adv_dvc_var *adv_dvc = &board->dvc_var.adv_dvc_var;
@@ -11880,8 +11883,8 @@ static void advansys_wide_free_mem(struct asc_board *board)
         }
 }
 
-static int advansys_board_found(struct Scsi_Host *shost, unsigned int iop,
-                                int bus_type)
+static int __devinit advansys_board_found(struct Scsi_Host *shost,
+                                          unsigned int iop, int bus_type)
 {
         struct pci_dev *pdev;
         struct asc_board *boardp = shost_priv(shost);
@@ -12426,7 +12429,7 @@ static PortAddr _asc_def_iop_base[ASC_IOADR_TABLE_MAX_IX] = {
  * 10: 12
  * 11: 15
  */
-static unsigned int advansys_isa_irq_no(PortAddr iop_base)
+static unsigned int __devinit advansys_isa_irq_no(PortAddr iop_base)
 {
         unsigned short cfg_lsw = AscGetChipCfgLsw(iop_base);
         unsigned int chip_irq = ((cfg_lsw >> 2) & 0x03) + 10;
@@ -12435,7 +12438,7 @@ static unsigned int advansys_isa_irq_no(PortAddr iop_base)
         return chip_irq;
 }
 
-static int advansys_isa_probe(struct device *dev, unsigned int id)
+static int __devinit advansys_isa_probe(struct device *dev, unsigned int id)
 {
         int err = -ENODEV;
         PortAddr iop_base = _asc_def_iop_base[id];
@@ -12475,7 +12478,7 @@ static int advansys_isa_probe(struct device *dev, unsigned int id)
         return err;
 }
 
-static int advansys_isa_remove(struct device *dev, unsigned int id)
+static int __devexit advansys_isa_remove(struct device *dev, unsigned int id)
 {
         int ioport = _asc_def_iop_base[id];
         advansys_release(dev_get_drvdata(dev));
@@ -12485,7 +12488,7 @@ static int advansys_isa_remove(struct device *dev, unsigned int id)
 
 static struct isa_driver advansys_isa_driver = {
         .probe          = advansys_isa_probe,
-        .remove         = advansys_isa_remove,
+        .remove         = __devexit_p(advansys_isa_remove),
         .driver = {
                 .owner  = THIS_MODULE,
                 .name   = DRV_NAME,
@@ -12503,7 +12506,7 @@ static struct isa_driver advansys_isa_driver = {
  * 110: 15
  * 111: invalid
  */
-static unsigned int advansys_vlb_irq_no(PortAddr iop_base)
+static unsigned int __devinit advansys_vlb_irq_no(PortAddr iop_base)
 {
         unsigned short cfg_lsw = AscGetChipCfgLsw(iop_base);
         unsigned int chip_irq = ((cfg_lsw >> 2) & 0x07) + 9;
@@ -12512,7 +12515,7 @@ static unsigned int advansys_vlb_irq_no(PortAddr iop_base)
         return chip_irq;
 }
 
-static int advansys_vlb_probe(struct device *dev, unsigned int id)
+static int __devinit advansys_vlb_probe(struct device *dev, unsigned int id)
 {
         int err = -ENODEV;
         PortAddr iop_base = _asc_def_iop_base[id];
@@ -12559,14 +12562,14 @@ static int advansys_vlb_probe(struct device *dev, unsigned int id)
 
 static struct isa_driver advansys_vlb_driver = {
         .probe          = advansys_vlb_probe,
-        .remove         = advansys_isa_remove,
+        .remove         = __devexit_p(advansys_isa_remove),
         .driver = {
                 .owner  = THIS_MODULE,
                 .name   = "advansys_vlb",
         },
 };
 
-static struct eisa_device_id advansys_eisa_table[] = {
+static struct eisa_device_id advansys_eisa_table[] __devinitdata = {
         { "ABP7401" },
         { "ABP7501" },
         { "" }
@@ -12593,7 +12596,7 @@ struct eisa_scsi_data {
  * 110: invalid
  * 111: invalid
  */
-static unsigned int advansys_eisa_irq_no(struct eisa_device *edev)
+static unsigned int __devinit advansys_eisa_irq_no(struct eisa_device *edev)
 {
         unsigned short cfg_lsw = inw(edev->base_addr + 0xc86);
         unsigned int chip_irq = ((cfg_lsw >> 8) & 0x07) + 10;
@@ -12602,7 +12605,7 @@ static unsigned int advansys_eisa_irq_no(struct eisa_device *edev)
         return chip_irq;
 }
 
-static int advansys_eisa_probe(struct device *dev)
+static int __devinit advansys_eisa_probe(struct device *dev)
 {
         int i, ioport, irq = 0;
         int err;
@@ -12675,7 +12678,7 @@ static int advansys_eisa_probe(struct device *dev)
         return err;
 }
 
-static int advansys_eisa_remove(struct device *dev)
+static __devexit int advansys_eisa_remove(struct device *dev)
 {
         int i;
         struct eisa_scsi_data *data = dev_get_drvdata(dev);
@@ -12699,12 +12702,12 @@ static struct eisa_driver advansys_eisa_driver = {
         .driver = {
                 .name =         DRV_NAME,
                 .probe =        advansys_eisa_probe,
-                .remove =       advansys_eisa_remove,
+                .remove =       __devexit_p(advansys_eisa_remove),
         }
 };
 
 /* PCI Devices supported by this driver */
-static struct pci_device_id advansys_pci_tbl[] = {
+static struct pci_device_id advansys_pci_tbl[] __devinitdata = {
         {PCI_VENDOR_ID_ASP, PCI_DEVICE_ID_ASP_1200A,
          PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
         {PCI_VENDOR_ID_ASP, PCI_DEVICE_ID_ASP_ABP940,
@@ -12722,7 +12725,7 @@ static struct pci_device_id advansys_pci_tbl[] = {
 
 MODULE_DEVICE_TABLE(pci, advansys_pci_tbl);
 
-static void advansys_set_latency(struct pci_dev *pdev)
+static void __devinit advansys_set_latency(struct pci_dev *pdev)
 {
         if ((pdev->device == PCI_DEVICE_ID_ASP_1200A) ||
             (pdev->device == PCI_DEVICE_ID_ASP_ABP940)) {
@@ -12735,8 +12738,8 @@ static void advansys_set_latency(struct pci_dev *pdev)
         }
 }
 
-static int advansys_pci_probe(struct pci_dev *pdev,
-                              const struct pci_device_id *ent)
+static int __devinit
+advansys_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 {
         int err, ioport;
         struct Scsi_Host *shost;
@@ -12789,7 +12792,7 @@ static int advansys_pci_probe(struct pci_dev *pdev,
         return err;
 }
 
-static void advansys_pci_remove(struct pci_dev *pdev)
+static void __devexit advansys_pci_remove(struct pci_dev *pdev)
 {
         advansys_release(pci_get_drvdata(pdev));
         pci_release_regions(pdev);
@@ -12800,7 +12803,7 @@ static struct pci_driver advansys_pci_driver = {
         .name =         DRV_NAME,
         .id_table =     advansys_pci_tbl,
         .probe =        advansys_pci_probe,
-        .remove =       advansys_pci_remove,
+        .remove =       __devexit_p(advansys_pci_remove),
 };
 
 static int __init advansys_init(void)