diff options
| author | Geoff Levand <geoffrey.levand@am.sony.com> | 2007-06-16 07:18:14 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-06-28 19:16:33 +1000 |
| commit | 848cfdc5c1cd2163ba0c9a6490d9adcb7a7c3518 (patch) | |
| tree | 0642486d9dddf7eecd94a7ed6de10275156a4d7f | |
| parent | 7961f20c09af4524266a808fed3695c4dcc98e59 (diff) | |
| download | op-kernel-dev-848cfdc5c1cd2163ba0c9a6490d9adcb7a7c3518.zip op-kernel-dev-848cfdc5c1cd2163ba0c9a6490d9adcb7a7c3518.tar.gz | |
[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 ec9030d..b050fc4 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, *p & 0xffff); } -static void __attribute__ ((unused)) _dump_256_bmp(const char *header, +static void __maybe_unused _dump_256_bmp(const char *header, const u64 *p, unsigned cpu, const char* func, int line) { 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) } #define dump_mask(_x) _dump_mask(_x, __func__, __LINE__) -static void __attribute__ ((unused)) _dump_mask(struct ps3_private* pd, +static void __maybe_unused _dump_mask(struct ps3_private *pd, const char* func, int line) { unsigned long flags; diff --git a/arch/powerpc/platforms/ps3/time.c b/arch/powerpc/platforms/ps3/time.c index 1bae8b1..802a9cc 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) } #define dump_time(_a) _dump_time(_a, __func__, __LINE__) -static void __attribute__ ((unused)) _dump_time(int time, const char* func, +static void __maybe_unused _dump_time(int time, const char *func, int line) { struct rtc_time tm; diff --git a/drivers/ps3/vuart.c b/drivers/ps3/vuart.c index ec2d36a..5333fb2 100644 --- a/drivers/ps3/vuart.c +++ b/drivers/ps3/vuart.c @@ -83,7 +83,7 @@ struct ports_bmp { } __attribute__ ((aligned (32))); #define dump_ports_bmp(_b) _dump_ports_bmp(_b, __func__, __LINE__) -static void __attribute__ ((unused)) _dump_ports_bmp( +static void __maybe_unused _dump_ports_bmp( const struct ports_bmp* bmp, const char* func, int line) { 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, } #define dump_port_params(_b) _dump_port_params(_b, __func__, __LINE__) -static void __attribute__ ((unused)) _dump_port_params(unsigned int port_number, +static void __maybe_unused _dump_port_params(unsigned int port_number, const char* func, int line) { #if defined(DEBUG) |
