From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932586AbcCOVcS (ORCPT ); Tue, 15 Mar 2016 17:32:18 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:64661 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932381AbcCOVcP (ORCPT ); Tue, 15 Mar 2016 17:32:15 -0400 From: Arnd Bergmann To: Dmitry Torokhov Cc: Arnd Bergmann , Daniel Mack , Haojian Zhuang , Robert Jarzmik , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] ARM: pxa/raumfeld: use PROPERTY_ENTRY_INTEGER to define props Date: Tue, 15 Mar 2016 22:31:17 +0100 Message-Id: <1458077493-350816-1-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 X-Provags-ID: V03:K0:y38F3q323RGoJtTKHbKLe7gdPYX47eodp5Vr0B0XiQ/1QeCEydc BoPs875CVpni6NNck2HCh1JompxxBE5wV+280ZeCX6SgNbr1Kkz5WoHAOWKUxKPbFj5tMYb HNEYF+tcQA8QRP7Di99QQaHtLh8pYJ3+sB493ICHsJKrIQwymN8wbVNAIu2XCYxUCkTEOyB Ls08eu2L04EjQLOBAQQYw== X-UI-Out-Filterresults: notjunk:1;V01:K0:s3ejXm7LstM=:9lQ2R7FXLB/io/JWFxdStN CJ3E1AEmoVSQXL1qIfxqtHhcF70Sdw2wGRZxh3EScWYWLoWhXeLFE/ZDOXk3X5VZu8SL1vstq tHoGDaILOgO0CYUjGjnMbOHKa8WBm5yKcy1PAf9mg8wRCBZOTAJRxdI0j3/r82M+ccBUQX8eb UroUexxsJQrwOZ9hTWMOT8ki1a6hwPvgZ4dfePll1Ag+QFpr6Mpl6SSNDd/8aS90c5vqxn0bZ tAjc4xQEkgrK/X6Nk57dsSHeEGrxM9DBTaHOmkKsUnCSciktXCVvEz04oLj2n7d/gI0iHGs6Z tGQSkb2pxSgfnfMbKUieNlBh7tGqjNDOPNJbWth+WqiJVU8WGPbI/IGQM72++iBsOIexQqVWe aOFnsTx3SKXKY8eTkprbqDVV5Vb/2PQVxoiRUWQ0iwlgQpIZFLcHLlxtqOklJZu/gZX4pq8m9 YlOurhq58q9kVO/9kkcBoUzFtCTHe1JDPcwZxbeZaAk8A3qEfgmep5RJsphzqOrRAo6TXhSSf NP2nwnhMXmv5fKIs27mgcfpobMPtYDRzgjS4p4pd1XXHBhuUjInIiUma63F6UvjttP+8q8K3j YXIPepCfgjgUtQBUau5a6DpkbjmuLOO+9cmNfbHUVeIhDcmMzvZDj798bgSPOEMGFFKXw3KsC DrCTXC/AjR+T+xaA73Vm+1ESehBKSTygEPt97zXwNopSALvnqnv49qB8keObMgRFOYBc= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org gcc-6.0 notices that the use of the property_entry in this file that was recently introduced cannot work right, as we initialize the wrong field: raumfeld.c:387:3: error: the address of 'raumfeld_rotary_encoder_steps' will always evaluate as 'true' [-Werror=address] DEV_PROP_U32, 1, &raumfeld_rotary_encoder_steps, }, ^~~~~~~~~~~~ raumfeld.c:389:3: error: the address of 'raumfeld_rotary_encoder_axis' will always evaluate as 'true' [-Werror=address] DEV_PROP_U32, 1, &raumfeld_rotary_encoder_axis, }, ^~~~~~~~~~~~ raumfeld.c:391:3: error: the address of 'raumfeld_rotary_encoder_relative_axis' will always evaluate as 'true' [-Werror=address] DEV_PROP_U32, 1, &raumfeld_rotary_encoder_relative_axis, }, ^~~~~~~~~~~~ The problem appears to stem from relying on an old definition of 'struct property', but it has changed several times since the code could have last been correct. This changes the code to use the PROPERTY_ENTRY_INTEGER() macro instead, which works fine for the current definition and is a safer way of doing the initialization. Signed-off-by: Arnd Bergmann Fixes: a9e340dce3c3 ("Input: rotary_encoder - move away from platform data structure") --- The broken patch is currently in the input-next tree, please apply this fixup on top. arch/arm/mach-pxa/raumfeld.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/arch/arm/mach-pxa/raumfeld.c b/arch/arm/mach-pxa/raumfeld.c index 16ffd01daff1..5a941bd3dbed 100644 --- a/arch/arm/mach-pxa/raumfeld.c +++ b/arch/arm/mach-pxa/raumfeld.c @@ -378,18 +378,11 @@ static struct gpiod_lookup_table raumfeld_rotary_gpios_table = { }, }; -static u32 raumfeld_rotary_encoder_steps = 24; -static u32 raumfeld_rotary_encoder_axis = REL_X; -static u32 raumfeld_rotary_encoder_relative_axis = 1; - static struct property_entry raumfeld_rotary_properties[] = { - { "rotary-encoder,steps-per-period", - DEV_PROP_U32, 1, &raumfeld_rotary_encoder_steps, }, - { "linux,axis", - DEV_PROP_U32, 1, &raumfeld_rotary_encoder_axis, }, - { "rotary-encoder,relative_axis", - DEV_PROP_U32, 1, &raumfeld_rotary_encoder_relative_axis, }, - { NULL } + PROPERTY_ENTRY_INTEGER("rotary-encoder,steps-per-period", u32, 24), + PROPERTY_ENTRY_INTEGER("linux,axis", u32, REL_X), + PROPERTY_ENTRY_INTEGER("rotary-encoder,relative_axis", u32, 1), + { }, }; static struct property_set raumfeld_rotary_property_set = { -- 2.7.0