The patch titled
ieee1394: remove unused macros HPSB_PANIC and HPSB_TRACE
has been removed from the -mm tree. Its filename is
ieee1394-remove-unused-macros-hpsb_panic-and.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: ieee1394: remove unused macros HPSB_PANIC and HPSB_TRACE
From: Stefan Richter <stefanr@xxxxxxxxxxxxxxxxx>
Signed-off-by: Stefan Richter <stefanr@xxxxxxxxxxxxxxxxx>
Cc: Ben Collins <bcollins@xxxxxxxxxx>
Cc: Jody McIntyre <scjody@xxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/ieee1394/ieee1394_transactions.c | 6 +++---
drivers/ieee1394/ieee1394_types.h | 5 -----
2 files changed, 3 insertions(+), 8 deletions(-)
diff -puN drivers/ieee1394/ieee1394_transactions.c~ieee1394-remove-unused-macros-hpsb_panic-and drivers/ieee1394/ieee1394_transactions.c
--- a/drivers/ieee1394/ieee1394_transactions.c~ieee1394-remove-unused-macros-hpsb_panic-and
+++ a/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_pack
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_pack
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 -puN drivers/ieee1394/ieee1394_types.h~ieee1394-remove-unused-macros-hpsb_panic-and drivers/ieee1394/ieee1394_types.h
--- a/drivers/ieee1394/ieee1394_types.h~ieee1394-remove-unused-macros-hpsb_panic-and
+++ a/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)
_
Patches currently in -mm which might be from stefanr@xxxxxxxxxxxxxxxxx are
origin.patch
git-ieee1394.patch
ieee1394-fix-kerneldoc-of-hpsb_alloc_host.patch
ieee1394-shrink-tlabel-pools-remove-tpool-semaphores.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
