X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fscsi%2Fseagate.c;fp=drivers%2Fscsi%2Fseagate.c;h=0ff83ddf13fe149d4ba736f4a13bcf1aa82b799a;hb=64ba3f394c830ec48a1c31b53dcae312c56f1604;hp=2679ea8bff1a98365225ff22662c7a3990239321;hpb=be1e6109ac94a859551f8e1774eb9a8469fe055c;p=linux-2.6.git

diff --git a/drivers/scsi/seagate.c b/drivers/scsi/seagate.c
index 2679ea8bf..0ff83ddf1 100644
--- a/drivers/scsi/seagate.c
+++ b/drivers/scsi/seagate.c
@@ -312,7 +312,7 @@ static Signature __initdata signatures[] = {
 	{"IBM F1 V1.2009/22/93", 5, 25, FD},
 };
 
-#define NUM_SIGNATURES ARRAY_SIZE(signatures)
+#define NUM_SIGNATURES (sizeof(signatures) / sizeof(Signature))
 #endif				/* n OVERRIDE */
 
 /*
@@ -457,7 +457,7 @@ int __init seagate_st0x_detect (struct scsi_host_template * tpnt)
  * space for the on-board RAM instead.
  */
 
-		for (i = 0; i < ARRAY_SIZE(seagate_bases); ++i) {
+		for (i = 0; i < (sizeof (seagate_bases) / sizeof (unsigned int)); ++i) {
 			void __iomem *p = ioremap(seagate_bases[i], 0x2000);
 			if (!p)
 				continue;
@@ -497,7 +497,7 @@ int __init seagate_st0x_detect (struct scsi_host_template * tpnt)
 		return 0;
 
 	hostno = instance->host_no;
-	if (request_irq (irq, do_seagate_reconnect_intr, IRQF_DISABLED, (controller_type == SEAGATE) ? "seagate" : "tmc-8xx", instance)) {
+	if (request_irq (irq, do_seagate_reconnect_intr, SA_INTERRUPT, (controller_type == SEAGATE) ? "seagate" : "tmc-8xx", instance)) {
 		printk(KERN_ERR "scsi%d : unable to allocate IRQ%d\n", hostno, irq);
 		return 0;
 	}
@@ -1002,7 +1002,7 @@ connect_loop:
 			}
 #endif
 
-			buffer = (struct scatterlist *) SCint->request_buffer;
+			buffer = (struct scatterlist *) SCint->buffer;
 			len = buffer->length;
 			data = page_address(buffer->page) + buffer->offset;
 		} else {