diff options
author | Geoff Levand <geoffrey.levand@am.sony.com> | 2007-06-15 17:18:14 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-06-28 05:16:33 -0400 |
commit | 848cfdc5c1cd2163ba0c9a6490d9adcb7a7c3518 (patch) | |
tree | 0642486d9dddf7eecd94a7ed6de10275156a4d7f | |
parent | 7961f20c09af4524266a808fed3695c4dcc98e59 (diff) |
[POWERPC] PS3: Use __maybe_unused
Change the PS3 debug routines from using the GCC specific
'__attribute__ ((unused))' to the preprocessor macro
__maybe_unused.
Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
-rw-r--r-- | arch/powerpc/platforms/ps3/interrupt.c | 4 | ||||
-rw-r--r-- | arch/powerpc/platforms/ps3/time.c | 2 | ||||
-rw-r--r-- | drivers/ps3/vuart.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/arch/powerpc/platforms/ps3/interrupt.c b/arch/powerpc/platforms/ps3/interrupt.c index ec9030dbb5f1..b050fc4cd883 100644 --- a/arch/powerpc/platforms/ps3/interrupt.c +++ b/arch/powerpc/platforms/ps3/interrupt.c | |||
@@ -533,7 +533,7 @@ static void _dump_64_bmp(const char *header, const u64 *p, unsigned cpu, | |||
533 | *p & 0xffff); | 533 | *p & 0xffff); |
534 | } | 534 | } |
535 | 535 | ||
536 | static void __attribute__ ((unused)) _dump_256_bmp(const char *header, | 536 | static void __maybe_unused _dump_256_bmp(const char *header, |
537 | const u64 *p, unsigned cpu, const char* func, int line) | 537 | const u64 *p, unsigned cpu, const char* func, int line) |
538 | { | 538 | { |
539 | pr_debug("%s:%d: %s %u {%016lx:%016lx:%016lx:%016lx}\n", | 539 | pr_debug("%s:%d: %s %u {%016lx:%016lx:%016lx:%016lx}\n", |
@@ -552,7 +552,7 @@ static void _dump_bmp(struct ps3_private* pd, const char* func, int line) | |||
552 | } | 552 | } |
553 | 553 | ||
554 | #define dump_mask(_x) _dump_mask(_x, __func__, __LINE__) | 554 | #define dump_mask(_x) _dump_mask(_x, __func__, __LINE__) |
555 | static void __attribute__ ((unused)) _dump_mask(struct ps3_private* pd, | 555 | static void __maybe_unused _dump_mask(struct ps3_private *pd, |
556 | const char* func, int line) | 556 | const char* func, int line) |
557 | { | 557 | { |
558 | unsigned long flags; | 558 | unsigned long flags; |
diff --git a/arch/powerpc/platforms/ps3/time.c b/arch/powerpc/platforms/ps3/time.c index 1bae8b19b363..802a9ccacb5e 100644 --- a/arch/powerpc/platforms/ps3/time.c +++ b/arch/powerpc/platforms/ps3/time.c | |||
@@ -39,7 +39,7 @@ static void _dump_tm(const struct rtc_time *tm, const char* func, int line) | |||
39 | } | 39 | } |
40 | 40 | ||
41 | #define dump_time(_a) _dump_time(_a, __func__, __LINE__) | 41 | #define dump_time(_a) _dump_time(_a, __func__, __LINE__) |
42 | static void __attribute__ ((unused)) _dump_time(int time, const char* func, | 42 | static void __maybe_unused _dump_time(int time, const char *func, |
43 | int line) | 43 | int line) |
44 | { | 44 | { |
45 | struct rtc_time tm; | 45 | struct rtc_time tm; |
diff --git a/drivers/ps3/vuart.c b/drivers/ps3/vuart.c index ec2d36a1bc67..5333fb2f0d86 100644 --- a/drivers/ps3/vuart.c +++ b/drivers/ps3/vuart.c | |||
@@ -83,7 +83,7 @@ struct ports_bmp { | |||
83 | } __attribute__ ((aligned (32))); | 83 | } __attribute__ ((aligned (32))); |
84 | 84 | ||
85 | #define dump_ports_bmp(_b) _dump_ports_bmp(_b, __func__, __LINE__) | 85 | #define dump_ports_bmp(_b) _dump_ports_bmp(_b, __func__, __LINE__) |
86 | static void __attribute__ ((unused)) _dump_ports_bmp( | 86 | static void __maybe_unused _dump_ports_bmp( |
87 | const struct ports_bmp* bmp, const char* func, int line) | 87 | const struct ports_bmp* bmp, const char* func, int line) |
88 | { | 88 | { |
89 | pr_debug("%s:%d: ports_bmp: %016lxh\n", func, line, bmp->status); | 89 | pr_debug("%s:%d: ports_bmp: %016lxh\n", func, line, bmp->status); |
@@ -107,7 +107,7 @@ static int ps3_vuart_match_id_to_port(enum ps3_match_id match_id, | |||
107 | } | 107 | } |
108 | 108 | ||
109 | #define dump_port_params(_b) _dump_port_params(_b, __func__, __LINE__) | 109 | #define dump_port_params(_b) _dump_port_params(_b, __func__, __LINE__) |
110 | static void __attribute__ ((unused)) _dump_port_params(unsigned int port_number, | 110 | static void __maybe_unused _dump_port_params(unsigned int port_number, |
111 | const char* func, int line) | 111 | const char* func, int line) |
112 | { | 112 | { |
113 | #if defined(DEBUG) | 113 | #if defined(DEBUG) |