Merge branch 'slab/urgent' into slab/next

[pandora-kernel.git] / drivers / target / tcm_fc / tcm_fc.h

diff --git a/drivers/target/tcm_fc/tcm_fc.h b/drivers/target/tcm_fc/tcm_fc.h
index 7b82f1b..bd4fe21 100644 (file)
--- a/drivers/target/tcm_fc/tcm_fc.h
+++ b/drivers/target/tcm_fc/tcm_fc.h
@@ -23,30 +23,6 @@
 #define FT_TPG_NAMELEN 32      /* max length of TPG name */
 #define FT_LUN_NAMELEN 32      /* max length of LUN name */
 
-/*
- * Debug options.
- */
-#define FT_DEBUG_CONF  0x01    /* configuration messages */
-#define        FT_DEBUG_SESS   0x02    /* session messages */
-#define        FT_DEBUG_TM     0x04    /* TM operations */
-#define        FT_DEBUG_IO     0x08    /* I/O commands */
-#define        FT_DEBUG_DATA   0x10    /* Data transfer */
-
-extern unsigned int ft_debug_logging;  /* debug options */
-
-#define FT_DEBUG(mask, fmt, args...)                                   \
-       do {                                                            \
-               if (ft_debug_logging & (mask))                          \
-                       printk(KERN_INFO "tcm_fc: %s: " fmt,            \
-                               __func__, ##args);                      \
-       } while (0)
-
-#define        FT_CONF_DBG(fmt, args...)       FT_DEBUG(FT_DEBUG_CONF, fmt, ##args)
-#define        FT_SESS_DBG(fmt, args...)       FT_DEBUG(FT_DEBUG_SESS, fmt, ##args)
-#define        FT_TM_DBG(fmt, args...)         FT_DEBUG(FT_DEBUG_TM, fmt, ##args)
-#define        FT_IO_DBG(fmt, args...)         FT_DEBUG(FT_DEBUG_IO, fmt, ##args)
-#define        FT_DATA_DBG(fmt, args...)       FT_DEBUG(FT_DEBUG_DATA, fmt, ##args)
-
 struct ft_transport_id {
        __u8    format;
        __u8    __resvd1[7];
@@ -195,7 +171,6 @@ int ft_write_pending(struct se_cmd *);
 int ft_write_pending_status(struct se_cmd *);
 u32 ft_get_task_tag(struct se_cmd *);
 int ft_get_cmd_state(struct se_cmd *);
-void ft_new_cmd_failure(struct se_cmd *);
 int ft_queue_tm_resp(struct se_cmd *);
 int ft_is_state_remove(struct se_cmd *);
 
@@ -212,4 +187,9 @@ void ft_dump_cmd(struct ft_cmd *, const char *caller);
 
 ssize_t ft_format_wwn(char *, size_t, u64);
 
+/*
+ * Underlying HW specific helper function
+ */
+void ft_invl_hw_context(struct ft_cmd *);
+
 #endif /* __TCM_FC_H__ */