From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752664AbdC0Lw4 (ORCPT ); Mon, 27 Mar 2017 07:52:56 -0400 Received: from mail-wr0-f195.google.com ([209.85.128.195]:33517 "EHLO mail-wr0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752257AbdC0Lwv (ORCPT ); Mon, 27 Mar 2017 07:52:51 -0400 Subject: [PATCH v2] staging: goldfish: Fix style issues in macros To: gregkh@linuxfoundation.org References: Cc: devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org From: aviyae Message-ID: <159caafb-be9c-32d7-9a15-e8593e93ddca@gmail.com> Date: Mon, 27 Mar 2017 14:52:37 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.7.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Aviya Erenfeld staging: goldfish: Fix style issues in macros Fix coding style issues in macros: 1. Add parenthesis around macros argument 2. Avoid arguments reuse in macros (For the eudyptula challenge) Signed-off-by: Aviya Erenfeld --- drivers/staging/goldfish/goldfish_audio.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/staging/goldfish/goldfish_audio.c b/drivers/staging/goldfish/goldfish_audio.c index bd55995..f1640ab 100644 --- a/drivers/staging/goldfish/goldfish_audio.c +++ b/drivers/staging/goldfish/goldfish_audio.c @@ -61,10 +61,12 @@ struct goldfish_audio { #define COMBINED_BUFFER_SIZE ((2 * READ_BUFFER_SIZE) + \ (2 * WRITE_BUFFER_SIZE)) -#define AUDIO_READ(data, addr) (readl(data->reg_base + addr)) -#define AUDIO_WRITE(data, addr, x) (writel(x, data->reg_base + addr)) +#define AUDIO_READ(data, addr) (readl((data)->reg_base + (addr))) +#define AUDIO_WRITE(data, addr, x) (writel(x, (data)->reg_base + (addr))) #define AUDIO_WRITE64(data, addr, addr2, x) \ - (gf_write_dma_addr((x), data->reg_base + addr, data->reg_base + addr2)) + ({typeof(data) _data = (data); \ + gf_write_dma_addr((x), _data->reg_base + (addr), \ + _data->reg_base + (addr2)); }) /* * temporary variable used between goldfish_audio_probe() and -- 2.7.4