X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fscsi%2Fg_NCR5380.c;h=e6bcfe949340a58837df06151803e1f5bcd69db9;hb=9464c7cf61b9433057924c36e6e02f303a00e768;hp=67f1100f310361708647f4c28952895a608dc82f;hpb=41689045f6a3cbe0550e1d34e9cc20d2e8c432ba;p=linux-2.6.git

diff --git a/drivers/scsi/g_NCR5380.c b/drivers/scsi/g_NCR5380.c
index 67f1100f3..e6bcfe949 100644
--- a/drivers/scsi/g_NCR5380.c
+++ b/drivers/scsi/g_NCR5380.c
@@ -91,6 +91,7 @@
 #define AUTOPROBE_IRQ
 #define AUTOSENSE
 
+#include <linux/config.h>
 
 #ifdef CONFIG_SCSI_GENERIC_NCR53C400
 #define NCR53C400_PSEUDO_DMA 1
@@ -137,9 +138,10 @@ static struct override {
 [1] __initdata = { { 0,},};
 #endif
 
-#define NO_OVERRIDES ARRAY_SIZE(overrides)
 
-#ifndef MODULE
+#define NO_OVERRIDES (sizeof(overrides) / sizeof(struct override))
+
+#ifndef MODULE 
 
 /**
  *	internal_setup		-	handle lilo command string override
@@ -208,7 +210,7 @@ static int __init do_NCR5380_setup(char *str)
 {
 	int ints[10];
 
-	get_options(str, ARRAY_SIZE(ints), ints);
+	get_options(str, sizeof(ints) / sizeof(int), ints);
 	internal_setup(BOARD_NCR5380, str, ints);
 	return 1;
 }
@@ -216,7 +218,7 @@ static int __init do_NCR5380_setup(char *str)
 /**
  * 	do_NCR53C400_setup		-	set up entry point
  *	@str: unused
- *	@ints: integer parameters from kernel setup code
+ *	@ints: integer parameters from kernel setup code 
  *
  *	Setup function invoked at boot to parse the ncr53c400= command
  *	line.
@@ -226,7 +228,7 @@ static int __init do_NCR53C400_setup(char *str)
 {
 	int ints[10];
 
-	get_options(str, ARRAY_SIZE(ints), ints);
+	get_options(str, sizeof(ints) / sizeof(int), ints);
 	internal_setup(BOARD_NCR53C400, str, ints);
 	return 1;
 }
@@ -234,7 +236,7 @@ static int __init do_NCR53C400_setup(char *str)
 /**
  * 	do_NCR53C400A_setup	-	set up entry point
  *	@str: unused
- *	@ints: integer parameters from kernel setup code
+ *	@ints: integer parameters from kernel setup code 
  *
  *	Setup function invoked at boot to parse the ncr53c400a= command
  *	line.
@@ -244,7 +246,7 @@ static int __init do_NCR53C400A_setup(char *str)
 {
 	int ints[10];
 
-	get_options(str, ARRAY_SIZE(ints), ints);
+	get_options(str, sizeof(ints) / sizeof(int), ints);
 	internal_setup(BOARD_NCR53C400A, str, ints);
 	return 1;
 }
@@ -252,7 +254,7 @@ static int __init do_NCR53C400A_setup(char *str)
 /**
  * 	do_DTC3181E_setup	-	set up entry point
  *	@str: unused
- *	@ints: integer parameters from kernel setup code
+ *	@ints: integer parameters from kernel setup code 
  *
  *	Setup function invoked at boot to parse the dtc3181e= command
  *	line.
@@ -262,7 +264,7 @@ static int __init do_DTC3181E_setup(char *str)
 {
 	int ints[10];
 
-	get_options(str, ARRAY_SIZE(ints), ints);
+	get_options(str, sizeof(ints) / sizeof(int), ints);
 	internal_setup(BOARD_DTC3181E, str, ints);
 	return 1;
 }
@@ -461,7 +463,7 @@ int __init generic_NCR5380_detect(struct scsi_host_template * tpnt)
 			instance->irq = NCR5380_probe_irq(instance, 0xffff);
 
 		if (instance->irq != SCSI_IRQ_NONE)
-			if (request_irq(instance->irq, generic_NCR5380_intr, IRQF_DISABLED, "NCR5380", instance)) {
+			if (request_irq(instance->irq, generic_NCR5380_intr, SA_INTERRUPT, "NCR5380", instance)) {
 				printk(KERN_WARNING "scsi%d : IRQ%d not free, interrupts disabled\n", instance->host_no, instance->irq);
 				instance->irq = SCSI_IRQ_NONE;
 			}