From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757729AbcFAIMR (ORCPT ); Wed, 1 Jun 2016 04:12:17 -0400 Received: from mout.kundenserver.de ([212.227.126.133]:62594 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757603AbcFAILw (ORCPT ); Wed, 1 Jun 2016 04:11:52 -0400 From: Arnd Bergmann To: Alexandre Belloni Cc: Greg Kroah-Hartman , Stephen Rothwell , linux-kernel@vger.kernel.org Subject: Re: [PATCH] char/mwave: remove custom BOOLEAN type Date: Wed, 01 Jun 2016 10:12:22 +0200 Message-ID: <14744261.hP1S9H3m8l@wuerfel> User-Agent: KMail/5.1.3 (Linux/4.4.0-22-generic; KDE/5.18.0; x86_64; ; ) In-Reply-To: <20160601080033.GA4249@piout.net> References: <1464726596-3957133-1-git-send-email-arnd@arndb.de> <20160601080033.GA4249@piout.net> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Provags-ID: V03:K0:iI+SS8ME1Jddm2JUg43U+tB0AKYEL9cBz1yanXnrqpWqkQVg3TL mGB716rLUCDeKtK33lmf7o70LsDrWQBsL/WZNTh14GBCbOfYAEtNy8jq80F4KU+aXEXu1dW Guw11qgg11/MIiq0r0YTDFzkinxe6W3MHaYkATs2vIev/jkP7n0qtCQ2IUPlLszOfDh0Egz v0MA2j/0R6lyiMeXKeMgg== X-UI-Out-Filterresults: notjunk:1;V01:K0:obKOl+pPmXI=:S0vHA7csN2+WUA2iZR0waF bU3lBZXdIQN9+QH8M1N6kdjpFGTmg/WS45u7R79J2lYguuV4EZry5PUifXUbhUgveBnP4pkU7 eguMeMNyvzMDCaqegJNSpxHNRSR7sPzWqmxCa7APxIAdZgSCC0FnOLvfGmpXtRGAxjpoyucRM EPRuDsddVYg3g2ABhDdsi2FJa3wEIj4LmsAUvYZRE0pKAbBzggUWq0lanFMQYsVLawGflq4/y e4fjeBs1zXr8faovdnydjETdtvYzo6saWE7vLniBCcEbncbk/J1dyqs+JPtxLRM6fXm3QVwDY RDqueCxajL5GtI6hjDasFfIs3OninOtRAKPkonedDMTIVwQuoUu+xB4m0Ch+V4G60j7eCb6GN cgXkiwhzmI6c9BLetw8fEP7jxHIx8PL4S+/aZ9S39v1BgpwJZfbh05iF5ia7SY8scG7WEUeCm Lu6h+BmEbZdmjGRW3Abppbn4onHCjhDhm2HYUnl4xhVz/PtIYqUaUIIPcuxV7sZHRskSLjGrk 2Z9u1gQw2YRzI3wsqR2XH/j1kNn2McALbltLJnXTmttbrT+diPGeiMwkcypVEsv+O4RyVIapn z0Gu1GhAuUg0Yqt3ePeMBS/pU+eoVtYAMe3AnpSdxadSYpSRpORl2rgoKxrWPy091qjrONpAb tsS3p1TMwjc6kpNjLnDK0MeWJBk7dNtKan8HEOOoSIUuoTNsFj8j/96KO9xAnd9c5QX2ASl+u 3xm7bz2k879fn7Tl Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wednesday, June 1, 2016 10:00:33 AM CEST Alexandre Belloni wrote: > On 31/05/2016 at 22:29:56 +0200, Arnd Bergmann wrote : > > 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 > > Fixes: fd09cc80165c ("rtc: cmos: move mc146818rtc code out of asm-generic/rtc.h") > Reviewed-by: Alexandre Belloni > > I guess you used sed anyway because they got changed in the strings as > well. > Yes, that is right. It also makes more sense to adapt the strings at the same time, so I left those changes in place. Arnd