aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/ips.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/scsi/ips.c')
-rw-r--r--drivers/scsi/ips.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/scsi/ips.c b/drivers/scsi/ips.c
index 5353b28b293..3c639286ec1 100644
--- a/drivers/scsi/ips.c
+++ b/drivers/scsi/ips.c
@@ -196,7 +196,6 @@
196#include <linux/module.h> 196#include <linux/module.h>
197 197
198#include <linux/stat.h> 198#include <linux/stat.h>
199#include <linux/config.h>
200 199
201#include <linux/spinlock.h> 200#include <linux/spinlock.h>
202#include <linux/init.h> 201#include <linux/init.h>
@@ -6438,7 +6437,7 @@ ips_erase_bios(ips_ha_t * ha)
6438 /* VPP failure */ 6437 /* VPP failure */
6439 return (1); 6438 return (1);
6440 6439
6441 /* check for succesful flash */ 6440 /* check for successful flash */
6442 if (status & 0x30) 6441 if (status & 0x30)
6443 /* sequence error */ 6442 /* sequence error */
6444 return (1); 6443 return (1);
@@ -6550,7 +6549,7 @@ ips_erase_bios_memio(ips_ha_t * ha)
6550 /* VPP failure */ 6549 /* VPP failure */
6551 return (1); 6550 return (1);
6552 6551
6553 /* check for succesful flash */ 6552 /* check for successful flash */
6554 if (status & 0x30) 6553 if (status & 0x30)
6555 /* sequence error */ 6554 /* sequence error */
6556 return (1); 6555 return (1);
@@ -7008,7 +7007,7 @@ ips_register_scsi(int index)
7008 memcpy(ha, oldha, sizeof (ips_ha_t)); 7007 memcpy(ha, oldha, sizeof (ips_ha_t));
7009 free_irq(oldha->irq, oldha); 7008 free_irq(oldha->irq, oldha);
7010 /* Install the interrupt handler with the new ha */ 7009 /* Install the interrupt handler with the new ha */
7011 if (request_irq(ha->irq, do_ipsintr, SA_SHIRQ, ips_name, ha)) { 7010 if (request_irq(ha->irq, do_ipsintr, IRQF_SHARED, ips_name, ha)) {
7012 IPS_PRINTK(KERN_WARNING, ha->pcidev, 7011 IPS_PRINTK(KERN_WARNING, ha->pcidev,
7013 "Unable to install interrupt handler\n"); 7012 "Unable to install interrupt handler\n");
7014 scsi_host_put(sh); 7013 scsi_host_put(sh);
@@ -7420,7 +7419,7 @@ ips_init_phase2(int index)
7420 } 7419 }
7421 7420
7422 /* Install the interrupt handler */ 7421 /* Install the interrupt handler */
7423 if (request_irq(ha->irq, do_ipsintr, SA_SHIRQ, ips_name, ha)) { 7422 if (request_irq(ha->irq, do_ipsintr, IRQF_SHARED, ips_name, ha)) {
7424 IPS_PRINTK(KERN_WARNING, ha->pcidev, 7423 IPS_PRINTK(KERN_WARNING, ha->pcidev,
7425 "Unable to install interrupt handler\n"); 7424 "Unable to install interrupt handler\n");
7426 return ips_abort_init(ha, index); 7425 return ips_abort_init(ha, index);