Merge branch 'linus' into core/softlockup

[linux-2.6] / drivers / scsi / aic94xx / aic94xx.h

diff --git a/drivers/scsi/aic94xx/aic94xx.h b/drivers/scsi/aic94xx/aic94xx.h
index 71a031df7a34320af014a1a64dc66364e3bae348..2ef459e9cda1a190213ae59fc2b64126f50c8923 100644 (file)
--- a/drivers/scsi/aic94xx/aic94xx.h
+++ b/drivers/scsi/aic94xx/aic94xx.h
@@ -56,9 +56,8 @@
 /* 2*ITNL timeout + 1 second */
 #define AIC94XX_SCB_TIMEOUT  (5*HZ)
 
-extern kmem_cache_t *asd_dma_token_cache;
-extern kmem_cache_t *asd_ascb_cache;
-extern char sas_addr_str[2*SAS_ADDR_SIZE + 1];
+extern struct kmem_cache *asd_dma_token_cache;
+extern struct kmem_cache *asd_ascb_cache;
 
 static inline void asd_stringify_sas_addr(char *p, const u8 *sas_addr)
 {
@@ -68,21 +67,6 @@ static inline void asd_stringify_sas_addr(char *p, const u8 *sas_addr)
        *p = '\0';
 }
 
-static inline void asd_destringify_sas_addr(u8 *sas_addr, const char *p)
-{
-       int i;
-       for (i = 0; i < SAS_ADDR_SIZE; i++) {
-               u8 h, l;
-               if (!*p)
-                       break;
-               h = isdigit(*p) ? *p-'0' : *p-'A'+10;
-               p++;
-               l = isdigit(*p) ? *p-'0' : *p-'A'+10;
-               p++;
-               sas_addr[i] = (h<<4) | l;
-       }
-}
-
 struct asd_ha_struct;
 struct asd_ascb;
 
@@ -102,6 +86,7 @@ int  asd_abort_task_set(struct domain_device *, u8 *lun);
 int  asd_clear_aca(struct domain_device *, u8 *lun);
 int  asd_clear_task_set(struct domain_device *, u8 *lun);
 int  asd_lu_reset(struct domain_device *, u8 *lun);
+int  asd_I_T_nexus_reset(struct domain_device *dev);
 int  asd_query_task(struct sas_task *);
 
 /* ---------- Adapter and Port management ---------- */