patch-2.4.0-test11 linux/drivers/ide/sis5513.c

Next file: linux/drivers/ide/sl82c105.c
Previous file: linux/drivers/ide/opti621.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.0-test10/linux/drivers/ide/sis5513.c linux/drivers/ide/sis5513.c
@@ -33,8 +33,6 @@
 
 static struct pci_dev *host_dev = NULL;
 
-#define arraysize(x)			(sizeof(x)/sizeof(*(x)))
-
 #define SIS5513_FLAG_ATA_00		0x00000000
 #define SIS5513_FLAG_ATA_16		0x00000001
 #define SIS5513_FLAG_ATA_33		0x00000002
@@ -545,7 +543,7 @@
 
 	pci_read_config_byte(dev, PCI_LATENCY_TIMER, &latency);
 
-	for (i = 0; i < arraysize (SiSHostChipInfo) && !host_dev; i++) {
+	for (i = 0; i < ARRAY_SIZE (SiSHostChipInfo) && !host_dev; i++) {
 		host = pci_find_device (PCI_VENDOR_ID_SI,
 					SiSHostChipInfo[i].host_id,
 					NULL);

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)