X-Git-Url: https://git.karo-electronics.de/?a=blobdiff_plain;f=drivers%2Ffirewire%2Ffw-transaction.h;h=fa7967b57408586359f70ae5bc610f39d7a55223;hb=c256e05b7b30fab484deacb4f8cff59ce649c75e;hp=acdc3be38c613af6ba6a6a4a0eae5921ac1cca3a;hpb=9b6a51746ffe8d619f1097675d2dc5e303470024;p=mv-sheeva.git

diff --git a/drivers/firewire/fw-transaction.h b/drivers/firewire/fw-transaction.h
index acdc3be38c6..fa7967b5740 100644
--- a/drivers/firewire/fw-transaction.h
+++ b/drivers/firewire/fw-transaction.h
@@ -81,7 +81,6 @@
 
 #define fw_notify(s, args...) printk(KERN_NOTICE KBUILD_MODNAME ": " s, ## args)
 #define fw_error(s, args...) printk(KERN_ERR KBUILD_MODNAME ": " s, ## args)
-#define fw_debug(s, args...) printk(KERN_DEBUG KBUILD_MODNAME ": " s, ## args)
 
 static inline void
 fw_memcpy_from_be32(void *_dst, void *_src, size_t size)
@@ -124,6 +123,10 @@ typedef void (*fw_transaction_callback_t)(struct fw_card *card, int rcode,
 					  size_t length,
 					  void *callback_data);
 
+/*
+ * Important note:  The callback must guarantee that either fw_send_response()
+ * or kfree() is called on the @request.
+ */
 typedef void (*fw_address_callback_t)(struct fw_card *card,
 				      struct fw_request *request,
 				      int tcode, int destination, int source,
@@ -228,7 +231,7 @@ struct fw_card {
 	unsigned long reset_jiffies;
 
 	unsigned long long guid;
-	int max_receive;
+	unsigned max_receive;
 	int link_speed;
 	int config_rom_generation;
 
@@ -246,7 +249,7 @@ struct fw_card {
 	struct fw_node *irm_node;
 	int color;
 	int gap_count;
-	int topology_type;
+	bool beta_repeaters_present;
 
 	int index;