aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Richter <stefanr@s5r6.in-berlin.de>2006-07-03 12:02:31 -0400
committerBen Collins <bcollins@ubuntu.com>2006-07-03 12:02:31 -0400
commitd83e7d8e7e9f41a9d0e68aaf24ec4e785dd071bb (patch)
treeeb026c5463e9f2338b975217a713beb6e7093c3c
parent66faadfac3b8488d27374acaa407e3bd7380131a (diff)
[PATCH] ieee1394: remove unused macros HPSB_PANIC and HPSB_TRACE
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de> Signed-off-by: Ben Collins <bcollins@ubuntu.com>
-rw-r--r--drivers/ieee1394/ieee1394_transactions.c6
-rw-r--r--drivers/ieee1394/ieee1394_types.h5
2 files changed, 3 insertions, 8 deletions
diff --git a/drivers/ieee1394/ieee1394_transactions.c b/drivers/ieee1394/ieee1394_transactions.c
index a114b91d606..751960037e2 100644
--- a/drivers/ieee1394/ieee1394_transactions.c
+++ b/drivers/ieee1394/ieee1394_transactions.c
@@ -14,6 +14,7 @@
#include <linux/smp_lock.h>
#include <linux/interrupt.h>
+#include <asm/bug.h>
#include <asm/errno.h>
#include "ieee1394.h"
@@ -214,7 +215,7 @@ int hpsb_packet_success(struct hpsb_packet *packet)
packet->node_id);
return -EAGAIN;
}
- HPSB_PANIC("reached unreachable code 1 in %s", __FUNCTION__);
+ BUG();
case ACK_BUSY_X:
case ACK_BUSY_A:
@@ -261,8 +262,7 @@ int hpsb_packet_success(struct hpsb_packet *packet)
packet->ack_code, packet->node_id, packet->tcode);
return -EAGAIN;
}
-
- HPSB_PANIC("reached unreachable code 2 in %s", __FUNCTION__);
+ BUG();
}
struct hpsb_packet *hpsb_make_readpacket(struct hpsb_host *host, nodeid_t node,
diff --git a/drivers/ieee1394/ieee1394_types.h b/drivers/ieee1394/ieee1394_types.h
index 6c246913b16..16fd2d0b5ed 100644
--- a/drivers/ieee1394/ieee1394_types.h
+++ b/drivers/ieee1394/ieee1394_types.h
@@ -65,11 +65,6 @@ typedef u16 arm_length_t;
#define HPSB_VERBOSE(fmt, args...)
#endif
-#define HPSB_PANIC(fmt, args...) panic("ieee1394: " fmt "\n" , ## args)
-
-#define HPSB_TRACE() HPSB_PRINT(KERN_INFO, "TRACE - %s, %s(), line %d", __FILE__, __FUNCTION__, __LINE__)
-
-
#ifdef __BIG_ENDIAN
static inline void *memcpy_le32(u32 *dest, const u32 *__src, size_t count)