diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-06-27 12:04:18 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-08-31 14:22:49 +0200 |
| commit | 26ec99b105d5d1465fffed563cfe1a90a7b150fd (patch) | |
| tree | cf84af5b90493ca4c3e7212ef87fc0f3730e1477 /drivers/char/mwave/smapi.c | |
| parent | 8b7d3a9d903ee1d1f5febc8e74223e4e72720e35 (diff) | |
| download | op-kernel-dev-26ec99b105d5d1465fffed563cfe1a90a7b150fd.zip op-kernel-dev-26ec99b105d5d1465fffed563cfe1a90a7b150fd.tar.gz | |
char/mwave: remove custom BOOLEAN type
The mwave driver has its own macros for the BOOLEAN type and the
TRUE/FALSE values. This is redundant because the kernel already
has bool/true/false, and it clashes with the ACPI headers that
also define these types. The linux/acpi.h header is now included
implicitly from mwave through the mc146818rtc.h header, as
reported by Stephen Rothwell:
In file included from drivers/char/mwave/smapi.c:51:0:
drivers/char/mwave/smapi.h:52:0: warning: "TRUE" redefined
#define TRUE 1
^
In file included from include/acpi/acpi.h:58:0,
from include/linux/acpi.h:33,
from include/linux/mc146818rtc.h:21,
from drivers/char/mwave/smapi.c:50:
include/acpi/actypes.h:438:0: note: this is the location of the previous definition
#define TRUE (1 == 1)
^
This removes the private types from mwave and uses the standard
types instead.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Fixes: fd09cc80165c ("rtc: cmos: move mc146818rtc code out of asm-generic/rtc.h")
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/char/mwave/smapi.c')
| -rw-r--r-- | drivers/char/mwave/smapi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/mwave/smapi.c b/drivers/char/mwave/smapi.c index 6187fd1..8c5411a 100644 --- a/drivers/char/mwave/smapi.c +++ b/drivers/char/mwave/smapi.c @@ -493,7 +493,7 @@ exit_smapi_request_error: } -int smapi_set_DSP_power_state(BOOLEAN bOn) +int smapi_set_DSP_power_state(bool bOn) { int bRC = -EIO; unsigned short usAX, usBX, usCX, usDX, usDI, usSI; @@ -556,7 +556,7 @@ int smapi_init(void) PRINTK_ERROR("smapi::smapi_init, ERROR unable to read from SMAPI port\n"); } else { PRINTK_2(TRACE_SMAPI, - "smapi::smapi_init, exit TRUE g_usSmapiPort %x\n", + "smapi::smapi_init, exit true g_usSmapiPort %x\n", g_usSmapiPort); retval = 0; //SmapiQuerySystemID(); |
