--- zzzz-none-000/linux-2.6.19.2/drivers/scsi/aic94xx/aic94xx_hwi.c	2007-01-10 19:10:37.000000000 +0000
+++ davinci-8020-5505/linux-2.6.19.2/drivers/scsi/aic94xx/aic94xx_hwi.c	2007-01-11 07:38:19.000000000 +0000
@@ -112,21 +112,6 @@
 	return 0;
 }
 
-static void asd_init_ports(struct asd_ha_struct *asd_ha)
-{
-	int i;
-
-	spin_lock_init(&asd_ha->asd_ports_lock);
-	for (i = 0; i < ASD_MAX_PHYS; i++) {
-		struct asd_port *asd_port = &asd_ha->asd_ports[i];
-
-		memset(asd_port->sas_addr, 0, SAS_ADDR_SIZE);
-		memset(asd_port->attached_sas_addr, 0, SAS_ADDR_SIZE);
-		asd_port->phy_mask = 0;
-		asd_port->num_phys = 0;
-	}
-}
-
 static int asd_init_phys(struct asd_ha_struct *asd_ha)
 {
 	u8 i;
@@ -136,7 +121,6 @@
 		struct asd_phy *phy = &asd_ha->phys[i];
 
 		phy->phy_desc = &asd_ha->hw_prof.phy_desc[i];
-		phy->asd_port = NULL;
 
 		phy->sas_phy.enabled = 0;
 		phy->sas_phy.id = i;
@@ -674,8 +658,6 @@
 		goto Out;
 	}
 
-	asd_init_ports(asd_ha);
-
 	err = asd_init_scbs(asd_ha);
 	if (err) {
 		asd_printk("couldn't initialize scbs for %s\n",